Merge branch 'next/boards' into HEAD

Conflicts:
	arch/arm/mach-shmobile/board-armadillo800eva.c
This commit is contained in:
Olof Johansson 2012-10-01 14:34:39 -07:00
commit a8e1ceb728
26 changed files with 633 additions and 33 deletions