]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'powerpc/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 00:22:58 +0000 (11:22 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 00:22:58 +0000 (11:22 +1100)
1  2 
arch/powerpc/kernel/traps.c
crypto/Kconfig

Simple merge
diff --cc crypto/Kconfig
Simple merge