Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorHerbert Xu <herbert@gondor.apana.org.au>
Fri, 3 Feb 2017 10:14:10 +0000 (18:14 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 3 Feb 2017 10:14:10 +0000 (18:14 +0800)
Merge the crypto tree to pick up arm64 output IV patch.

1  2 
arch/x86/crypto/aesni-intel_glue.c

Simple merge