Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorHerbert Xu <herbert@gondor.apana.org.au>
Thu, 28 May 2015 03:16:41 +0000 (11:16 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Thu, 28 May 2015 03:16:41 +0000 (11:16 +0800)
Merge the crypto tree for 4.1 to pull in the changeset that disables
algif_aead.


Trivial merge