]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'crypto/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 03:02:04 +0000 (13:02 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 03:02:04 +0000 (13:02 +1000)
commitabd0d08ea6b890b9bb8b33af0c4bd4fe5067716a
treed0962d81b666d5c056e3618ce15437ff27045451
parentd5e3e3c9af27df25239bacaaef3efd91d8bf23c0
parent200429cc63399e99dd2abcdca5088559a911ef2b
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
drivers/crypto/hifn_795x.c
drivers/crypto/ux500/cryp/cryp_core.c
drivers/crypto/ux500/hash/hash_core.c