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

Merge the crypto tree to pull in vmx ghash fix.

diff --cc drivers/char/hw_random/Kconfig
Simple merge

diff --cc drivers/crypto/caam/caamalg.c
index eb97562,b304421..156aad1
--- 1/drivers/crypto/caam/caamalg.c
--- 2/drivers/crypto/caam/caamalg.c
+++ b/drivers/crypto/caam/caamalg.c
@@@ -601,12 -568,21 +604,20 @@@ skip_enc
        append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS2 | FIFOLD_TYPE_MSG |
                             KEY_VLF);
  
+       if (alg->caam.geniv) {
+               append_seq_load(desc, ivsize, LDST_CLASS_1_CCB |
+                               LDST_SRCDST_BYTE_CONTEXT |
+                               (ctx1_iv_off << LDST_OFFSET_SHIFT));
+               append_move(desc, MOVE_SRC_CLASS1CTX | MOVE_DEST_CLASS2INFIFO |
+                           (ctx1_iv_off << MOVE_OFFSET_SHIFT) | ivsize);
+       }
+ 
        /* Load Counter into CONTEXT1 reg */
        if (is_rfc3686)
 -              append_load_imm_u32(desc, be32_to_cpu(1), LDST_IMM |
 -                                  LDST_CLASS_1_CCB |
 -                                  LDST_SRCDST_BYTE_CONTEXT |
 -                                  ((ctx1_iv_off + CTR_RFC3686_IV_SIZE) <<
 -                                   LDST_OFFSET_SHIFT));
 +              append_load_imm_be32(desc, 1, LDST_IMM | LDST_CLASS_1_CCB |
 +                                   LDST_SRCDST_BYTE_CONTEXT |
 +                                   ((ctx1_iv_off + CTR_RFC3686_IV_SIZE) <<
 +                                    LDST_OFFSET_SHIFT));
  
        /* Choose operation */
        if (ctr_mode)