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)
commit6d7e3d89954af773c70948a54cfa2aaa15907c1c
tree6908f5e0e1af7294c00dc4e06ed583ef62f594df
parentd725332208ef13241fc435eece790c9d0ea16a4e
parentf858c7bcca8c20761a20593439fe998b4b67e86b
Merge git://git./linux/kernel/git/herbert/crypto-2.6

Merge the crypto tree for 4.1 to pull in the changeset that disables
algif_aead.
crypto/Kconfig
crypto/algif_aead.c
drivers/crypto/Kconfig