]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'depends/rmk/smp' into tmp
authorArnd Bergmann <arnd@arndb.de>
Thu, 20 Oct 2011 15:57:46 +0000 (17:57 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 20 Oct 2011 15:57:46 +0000 (17:57 +0200)
1  2 
arch/arm/Kconfig
arch/arm/kernel/smp_scu.c

Simple merge
Simple merge