]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'next/soc' into for-next
authorArnd Bergmann <arnd@arndb.de>
Thu, 20 Jun 2013 20:52:03 +0000 (22:52 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 20 Jun 2013 20:54:07 +0000 (22:54 +0200)
commit464176252da3ef672e0a011d84f8b847953a697d
tree9cfcdd8d0065b52ca384ed7ef0f67970f6fb62c7
parent86f219ee98ccc19364c8e477642ed113e03b0a95
parente43995ad58264f5113a27d4c6c75edadcf126840
Merge branch 'next/soc' into for-next

Conflicts:
arch/arm/Kconfig
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/arm-soc-for-next-contents.txt
arch/arm/plat-samsung/Kconfig
arch/arm/plat-samsung/Makefile
drivers/gpio/Kconfig