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

Pull crypto update from Herbert Xu:
 - The crypto API is now documented :)
 - Disallow arbitrary module loading through crypto API.
 - Allow get request with empty driver name through crypto_user.
 - Allow speed testing of arbitrary hash functions.
 - Add caam support for ctr(aes), gcm(aes) and their derivatives.
 - nx now supports concurrent hashing properly.
 - Add sahara support for SHA1/256.
 - Add ARM64 version of CRC32.
 - Misc fixes.

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (77 commits)
  crypto: tcrypt - Allow speed testing of arbitrary hash functions
  crypto: af_alg - add user space interface for AEAD
  crypto: qat - fix problem with coalescing enable logic
  crypto: sahara - add support for SHA1/256
  crypto: sahara - replace tasklets with kthread
  crypto: sahara - add support for i.MX53
  crypto: sahara - fix spinlock initialization
  crypto: arm - replace memset by memzero_explicit
  crypto: powerpc - replace memset by memzero_explicit
  crypto: sha - replace memset by memzero_explicit
  crypto: sparc - replace memset by memzero_explicit
  crypto: algif_skcipher - initialize upon init request
  crypto: algif_skcipher - removed unneeded code
  crypto: algif_skcipher - Fixed blocking recvmsg
  crypto: drbg - use memzero_explicit() for clearing sensitive data
  crypto: drbg - use MODULE_ALIAS_CRYPTO
  crypto: include crypto- module prefix in template
  crypto: user - add MODULE_ALIAS
  crypto: sha-mb - remove a bogus NULL check
  crytpo: qat - Fix 64 bytes requests
  ...

diff --cc arch/arm64/crypto/Kconfig
Simple merge

diff --cc arch/arm64/crypto/aes-ce-ccm-glue.c
Simple merge

diff --cc arch/arm64/crypto/aes-glue.c
Simple merge

diff --cc crypto/af_alg.c
Simple merge

diff --cc crypto/algif_hash.c
Simple merge

diff --cc crypto/algif_skcipher.c
Simple merge

diff --cc drivers/crypto/qat/qat_common/adf_accel_devices.h
Simple merge

diff --cc drivers/crypto/qat/qat_common/adf_transport.c
Simple merge

diff --cc drivers/crypto/qat/qat_common/qat_algs.c
Simple merge

diff --cc drivers/crypto/qat/qat_dh895xcc/adf_isr.c
Simple merge

diff --cc include/net/sock.h
Simple merge

diff --cc net/core/sock.c
Simple merge