]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorHerbert Xu <herbert@lithui.me.apana.org.au>
Fri, 22 Dec 2017 09:00:50 +0000 (20:00 +1100)
committerHerbert Xu <herbert@lithui.me.apana.org.au>
Fri, 22 Dec 2017 09:00:50 +0000 (20:00 +1100)
commit61c238fb74a8359130f287696caf6a689175a6dd
treea5e7c8428030ec0462b58133d6548ddff3802018
parent53b1c0b38b48adc198e3d5341489bcbc05657469
parent5e7a57aabf3cef158982526f0eb972c2ff4d72a7
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Merge the crypto tree to pick up inside-secure fixes.
MAINTAINERS
crypto/af_alg.c
crypto/algif_aead.c
crypto/mcryptd.c
drivers/crypto/chelsio/Kconfig