]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'next/soc' into for-next
authorArnd Bergmann <arnd@arndb.de>
Thu, 21 Mar 2013 16:35:24 +0000 (17:35 +0100)
committerArnd Bergmann <arnd@arndb.de>
Thu, 21 Mar 2013 16:36:24 +0000 (17:36 +0100)
commit2f8ffc91042778a5a60114c74916489b27152e33
tree2205b3d95976a83861d868ce99c9ac5b6242d6d4
parent521ea629d487d1f3db2493a39c9f2fc0890bb5b4
parentf965ebdab662082e3419f5868bb2915fe5cc9a43
Merge branch 'next/soc' into for-next

Conflicts:
arch/arm/Kconfig
arch/arm/Kconfig
arch/arm/arm-soc-for-next-contents.txt