]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branches 'heads/fixes', 'heads/defconfig', 'heads/boards' and 'heads/soc' into...
authorSimon Horman <horms@verge.net.au>
Tue, 6 Nov 2012 04:48:55 +0000 (13:48 +0900)
committerSimon Horman <horms@verge.net.au>
Tue, 6 Nov 2012 04:48:55 +0000 (13:48 +0900)
commitde39c8b845a973dd036e6d1d58c7554e85f3b9af
treec18bb0cbfd4588d600aee30da3f47830243a9ccc
parented7d132a634e7e4c3fa657363df5df39e7f768e4
parent67e13cbb807c6b95706e4ec0ca2c068f14f25588
parent631a7b5d958d2ef2c2333b105794c693642f0641
parent86bc52ef4373be64867b56f3a9e30cbabf64e0dd
Merge branches 'heads/fixes', 'heads/defconfig', 'heads/boards' and 'heads/soc' into next

Conflicts:
arch/arm/configs/marzen_defconfig
arch/arm/configs/armadillo800eva_defconfig
arch/arm/configs/kzm9g_defconfig
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/Makefile
arch/arm/mach-shmobile/board-armadillo800eva.c
arch/arm/mach-shmobile/clock-r8a7779.c
arch/arm/mach-shmobile/setup-r8a7779.c