]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'heads/boards' into next
authorSimon Horman <horms@verge.net.au>
Tue, 18 Sep 2012 02:27:33 +0000 (11:27 +0900)
committerSimon Horman <horms@verge.net.au>
Tue, 18 Sep 2012 02:27:33 +0000 (11:27 +0900)
commit2e2e9d5645becf6e519a4023721de39481258df8
tree6f440196a48f506e66238e7fff4a33633f32444c
parent21c240bf1577d0532af37e8a642b12e82f89166b
parent524bd0a50e4c315a235c42c03ec1325fb118accd
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