]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'crypto/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Sep 2012 02:15:01 +0000 (12:15 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Sep 2012 02:15:01 +0000 (12:15 +1000)
commit0abbd27cad72c946fe974c61fd358b93bcf3451a
tree9557b4136422a63dd021b19ce2b878b387d28cb7
parentfdc06c650d1892ccf901b8aab9ef602a0a8f0cd2
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