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