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.

diff --cc crypto/Kconfig
Simple merge

diff --cc crypto/algif_aead.c
Simple merge

diff --cc drivers/crypto/Kconfig
Simple merge