]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'heads/boards' into next
authorSimon Horman <horms@verge.net.au>
Mon, 1 Oct 2012 05:24:16 +0000 (14:24 +0900)
committerSimon Horman <horms@verge.net.au>
Mon, 1 Oct 2012 05:24:16 +0000 (14:24 +0900)
commitb6812736c3053a2ee4cd6eadd4175e3c7044e428
treea752cc98f155c28da75f9579c42d9b6871c9b09d
parentb6377dea4c0231f320dbd718be05d2ddc4922fa3
parentd8e6e278ec27f4acea1688eaa188624919f76564
Merge branch 'heads/boards' into next

Conflicts:
arch/arm/mach-shmobile/board-armadillo800eva.c
arch/arm/configs/armadillo800eva_defconfig
arch/arm/configs/kzm9g_defconfig
arch/arm/configs/marzen_defconfig
arch/arm/mach-shmobile/board-armadillo800eva.c
arch/arm/mach-shmobile/board-kzm9g.c
arch/arm/mach-shmobile/board-marzen.c