hansson <olof@lixom.net> 1349127279 -0700
committer Olof Johansson <olof@lixom.net> 1349127279 -0700

Merge branch 'next/boards' into HEAD

Conflicts:
	arch/arm/mach-shmobile/board-armadillo800eva.c
u