Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

author Herbert Xu <herbert@lithui.me.apana.org.au>

Fri, 22 Dec 2017 09:00:50 +0000 (20:00 +1100)

committer Herbert Xu <herbert@lithui.me.apana.org.au>

Fri, 22 Dec 2017 09:00:50 +0000 (20:00 +1100)
author Herbert Xu <herbert@lithui.me.apana.org.au>
Fri, 22 Dec 2017 09:00:50 +0000 (20:00 +1100)
committer Herbert Xu <herbert@lithui.me.apana.org.au>
Fri, 22 Dec 2017 09:00:50 +0000 (20:00 +1100)
diff --cc MAINTAINERS
Simple merge
diff --cc crypto/af_alg.c
Simple merge
diff --cc crypto/algif_aead.c
Simple merge
diff --cc crypto/mcryptd.c
Simple merge
diff --cc drivers/crypto/chelsio/Kconfig
Simple merge
author	Herbert Xu <herbert@lithui.me.apana.org.au>
	Fri, 22 Dec 2017 09:00:50 +0000 (20:00 +1100)
committer	Herbert Xu <herbert@lithui.me.apana.org.au>
	Fri, 22 Dec 2017 09:00:50 +0000 (20:00 +1100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
crypto/af_alg.c	patch \|	diff1 \|	diff2 \|	blob \| history
crypto/algif_aead.c	patch \|	diff1 \|	diff2 \|	blob \| history
crypto/mcryptd.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/crypto/chelsio/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history