]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'next/spring-cleaning' into for-next
authorArnd Bergmann <arnd@arndb.de>
Thu, 21 Mar 2013 17:15:30 +0000 (18:15 +0100)
committerArnd Bergmann <arnd@arndb.de>
Thu, 21 Mar 2013 17:15:30 +0000 (18:15 +0100)
Conflicts:
arch/arm/Kconfig
arch/arm/Makefile

1  2 
arch/arm/Kconfig
arch/arm/Makefile

Simple merge
Simple merge