]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'crypto/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 03:45:12 +0000 (13:45 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 03:45:14 +0000 (13:45 +1000)
commit87becd39886c3306ab6f6b9cbd321f1251e637ad
tree045a4be486e65cada6591849ba55f254fbf1e16b
parent216a3df7bd3037731a061ec11c6aa2d31518df45
parent1711045fb11b4aa9afda066ce5fe68b2345d52c5
Merge remote-tracking branch 'crypto/master'

Conflicts:
crypto/Kconfig
MAINTAINERS
arch/arm/Kconfig
arch/mips/cavium-octeon/crypto/octeon-crypto.h
arch/x86/crypto/aesni-intel_glue.c
crypto/algif_aead.c
crypto/algif_rng.c