tree 6908f5e0e1af7294c00dc4e06ed583ef62f594df
parent d725332208ef13241fc435eece790c9d0ea16a4e
parent f858c7bcca8c20761a20593439fe998b4b67e86b
author Herbert Xu <herbert@gondor.apana.org.au> 1432783001 +0800
committer Herbert Xu <herbert@gondor.apana.org.au> 1432783001 +0800

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Merge the crypto tree for 4.1 to pull in the changeset that disables
algif_aead.