]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'galak/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Apr 2013 23:24:10 +0000 (10:24 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Apr 2013 23:24:10 +0000 (10:24 +1100)
1  2 
arch/powerpc/Kconfig
arch/powerpc/kernel/cputable.c
arch/powerpc/platforms/Kconfig.cputype

Simple merge
Simple merge