aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2016-07-21 12:26:55 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2016-07-21 12:26:55 +0800
commit51b259bb01fcfb372ae39332936055b18328946c (patch)
treee0be652c70a772e7cc8a6ad6daa6d53e70a25d98 /lib
parentcrypto: vmx - Fix aes_p8_xts_decrypt build failure (diff)
parentcrypto: qat - make qat_asym_algs.o depend on asn1 headers (diff)
downloadlinux-dev-51b259bb01fcfb372ae39332936055b18328946c.tar.xz
linux-dev-51b259bb01fcfb372ae39332936055b18328946c.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree to resolve conflict in qat Makefile.
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions