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

Merge crypto-2.6 to resolve caam conflict with skcipher conversion.

diff --cc drivers/crypto/caam/caamalg.c
index 8152c6319c5746635259aa5fdd8287a71c756bc2,ec40f991e6c63c4e6be98df8fc964312bc9afbf2..2f9f803bb1c459f701f55f9028e2b37e361f0763
--- 1/drivers/crypto/caam/caamalg.c
--- 2/drivers/crypto/caam/caamalg.c
+++ b/drivers/crypto/caam/caamalg.c
@@@ -1493,8 -1553,9 +1493,8 @@@ static struct skcipher_edesc *skcipher_
        edesc->src_nents = src_nents;
        edesc->dst_nents = dst_nents;
        edesc->sec4_sg_bytes = sec4_sg_bytes;
-       edesc->sec4_sg = (void *)edesc + sizeof(struct skcipher_edesc) +
-                        desc_bytes;
+       edesc->sec4_sg = (struct sec4_sg_entry *)((u8 *)edesc->hw_desc +
+                                                 desc_bytes);
 -      edesc->iv_dir = DMA_TO_DEVICE;
  
        /* Make sure IV is located in a DMAable area */
        iv = (u8 *)edesc->hw_desc + desc_bytes + sec4_sg_bytes;