]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'crypto/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Sep 2012 02:56:49 +0000 (12:56 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Sep 2012 02:56:49 +0000 (12:56 +1000)
commitc630db768fe6f06c4028315691e8bb1a9998f054
tree5aa607b5aec266b4d135b11719b8ce20919be9a2
parente51ea0893e8e372cd374c26a9028a55a5aa5f098
parent821873abc20e28fe3faa98591dab91d9b00700a5
Merge remote-tracking branch 'crypto/master'

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