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

Merge the crypto tree to pull in chelsio chcr fix.

diff --cc crypto/Makefile
Simple merge

diff --cc crypto/drbg.c
index 9a95b619e19a85e854dc6d6781f596388e89ffd0,053035b5c8f85686446df108ccbf3675a19cd056..8a4d98b4adba46bafb30928cc6b28426427802ce
--- 1/crypto/drbg.c
--- 2/crypto/drbg.c
+++ b/crypto/drbg.c
@@@ -1765,11 -1779,15 +1779,16 @@@ static int drbg_kcapi_sym_ctr(struct dr
                }
                init_completion(&drbg->ctr_completion);
  
+               memcpy(outbuf, drbg->outscratchpad, cryptlen);
+ 
                outlen -= cryptlen;
 +              outbuf += cryptlen;
        }
+       ret = 0;
  
-       return 0;
+ out:
+       memzero_explicit(drbg->outscratchpad, DRBG_OUTSCRATCHLEN);
+       return ret;
  }
  #endif /* CONFIG_CRYPTO_DRBG_CTR */
  

diff --cc drivers/crypto/caam/caamalg.c
Simple merge