]> 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)
commitdb9c217ede62d0cfa4c3f8c89a18e185933c4f87
tree6908f5e0e1af7294c00dc4e06ed583ef62f594df
parent27c054232c352b59bdef6d25c2dfe034722371e5
parent3dcc25e6f0be9ef032af6523ab5cfcc41c604b73
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