]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'heads/boards' into next
authorSimon Horman <horms@verge.net.au>
Mon, 24 Sep 2012 23:53:42 +0000 (08:53 +0900)
committerSimon Horman <horms@verge.net.au>
Mon, 24 Sep 2012 23:53:42 +0000 (08:53 +0900)
commitcadd90f8304d617b18cf3ae085448e58015897bd
treebd68e2808e2ed0beda214cb4532cf40449313386
parentf5e0e9cddaaa3013f8703e764c6f707e843134a0
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