]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'crypto/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 20 Sep 2012 02:10:41 +0000 (12:10 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 20 Sep 2012 02:10:41 +0000 (12:10 +1000)
commit701250e7d4fbdb794f0d08146ef467c87e5f373a
treeef58aee23e89e688da8a75b51db36787176f6595
parent60b538ef674dfa7113e0c613cbf735440b6ba24e
parent821873abc20e28fe3faa98591dab91d9b00700a5
Merge remote-tracking branch 'crypto/master'

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