]> 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, 30 Oct 2012 07:34:14 +0000 (15:34 +0800)
committerSimon Horman <horms@verge.net.au>
Tue, 30 Oct 2012 07:34:14 +0000 (15:34 +0800)
commitaf021e3637c75257fa9941f300cb076ef85c49e2
treee1abc79bfe2047d2d1b36839b319cf31b0ecd483
parented7d132a634e7e4c3fa657363df5df39e7f768e4
parent9a32fd6529e90d1dde157d155ae8e3fca61c31f7
parent631a7b5d958d2ef2c2333b105794c693642f0641
parent7b9621fb8a7f3602f86773e688e4fa4dd9bbfb73
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/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