OSDN Git Service

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)
commit45fa9a324d0f5be9140ba2e0db9b8fb8a0b9b7e8
treea5e7c8428030ec0462b58133d6548ddff3802018
parentfc8517bf627c9b834f80274a1bc9ecd39b27231b
parent2973633e9f09311e849f975d969737af81a521ff
Merge git://git./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