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

Merge the crypto tree to resolve conflict in qat Makefile.

1 files changed, 1 insertions, 0 deletions

diff --git a/crypto/crypto_user.c b/crypto/crypto_user.c
index c24a40c8a4bf..1c5705481c69 100644
--- a/crypto/crypto_user.c
+++ b/crypto/crypto_user.c
@@ -440,6 +440,7 @@ static const int crypto_msg_min[CRYPTO_NR_MSGTYPES] = {
         [CRYPTO_MSG_NEWALG      - CRYPTO_MSG_BASE] = MSGSIZE(crypto_user_alg),
         [CRYPTO_MSG_DELALG      - CRYPTO_MSG_BASE] = MSGSIZE(crypto_user_alg),
         [CRYPTO_MSG_UPDATEALG   - CRYPTO_MSG_BASE] = MSGSIZE(crypto_user_alg),
+        [CRYPTO_MSG_GETALG      - CRYPTO_MSG_BASE] = MSGSIZE(crypto_user_alg),
         [CRYPTO_MSG_DELRNG      - CRYPTO_MSG_BASE] = 0,
 };