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

Merge the crypto tree to pick up inside-secure fixes.

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