]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'next/cleanup' into for-next
authorArnd Bergmann <arnd@arndb.de>
Fri, 15 Mar 2013 22:00:42 +0000 (23:00 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 15 Mar 2013 22:01:13 +0000 (23:01 +0100)
commita29e936aaaa1d296395ea17efa4e007eb77b787a
treec9783e4e8c61479a425eb6c382fdfff029c9718f
parente5c5408decc71b39671e54acdd32bef16de9bf85
parentb0d62d977674d178ac9bc0acaa3cb5cdd166035d
Merge branch 'next/cleanup' into for-next

Conflicts:
arch/arm/mach-spear/spear13xx.c
arch/arm/Kconfig
arch/arm/arm-soc-for-next-contents.txt
arch/arm/mach-spear/spear13xx.c