]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'crypto/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Sep 2012 02:50:38 +0000 (12:50 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Sep 2012 02:50:38 +0000 (12:50 +1000)
commitd761f682cd8764b91f35f3e35a53119d2cecf6d6
tree2078e03e1742feab9c6e809f41f583f7e2c7a728
parentd913cf56c70d27ff4dbb97f03bfb1cc63d381b84
parent821873abc20e28fe3faa98591dab91d9b00700a5
Merge remote-tracking branch 'crypto/master'

Conflicts:
crypto/Kconfig
MAINTAINERS
arch/powerpc/configs/ppc64_defconfig
arch/powerpc/kernel/prom_init.c
crypto/Kconfig
drivers/crypto/caam/key_gen.c