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