]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit93a7d6facc8ebcde98be2ef74fa23e6a1b9b1bab
tree6908f5e0e1af7294c00dc4e06ed583ef62f594df
parentbf0145b91017ae235efa011bd319650feffb5df6
parentc2d8ca18e8c41504a7079801fee51b43d186fb21
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.
crypto/Kconfig
crypto/algif_aead.c
drivers/crypto/Kconfig