]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'heads/boards' into next
authorSimon Horman <horms@verge.net.au>
Fri, 12 Oct 2012 04:24:08 +0000 (13:24 +0900)
committerSimon Horman <horms@verge.net.au>
Fri, 12 Oct 2012 04:24:08 +0000 (13:24 +0900)
commitab48623afc7486f39f888d644bd6576bedaeca7d
tree833ddb6e1463f77932077d871b39c1451a98943d
parent795ec8a3a6f31038e09429581cb624bdc4fd6b32
parent5e8051bb6e4a2228fec1b0739b6775aa4da3d342
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