]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'crypto/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Sep 2012 02:43:34 +0000 (12:43 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Sep 2012 02:43:34 +0000 (12:43 +1000)
1  2 
MAINTAINERS
arch/powerpc/configs/ppc64_defconfig
arch/powerpc/kernel/prom_init.c
crypto/Kconfig

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
diff --cc crypto/Kconfig
Simple merge