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

Pull crypto update from Herbert Xu:
 - Do not idle omap device between crypto operations in one session.
 - Added sha224/sha384 shims for SSSE3.
 - More optimisations for camellia-aesni-avx2.
 - Removed defunct blowfish/twofish AVX2 implementations.
 - Added unaligned buffer self-tests.
 - Added PCLMULQDQ optimisation for CRCT10DIF.
 - Added support for Freescale's DCP co-processor
 - Misc fixes.

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (44 commits)
  crypto: testmgr - test hash implementations with unaligned buffers
  crypto: testmgr - test AEADs with unaligned buffers
  crypto: testmgr - test skciphers with unaligned buffers
  crypto: testmgr - check that entries in alg_test_descs are in correct order
  Revert "crypto: twofish - add AVX2/x86_64 assembler implementation of twofish cipher"
  Revert "crypto: blowfish - add AVX2/x86_64 implementation of blowfish cipher"
  crypto: camellia-aesni-avx2 - tune assembly code for more performance
  hwrng: bcm2835 - fix MODULE_LICENSE tag
  hwrng: nomadik - use clk_prepare_enable()
  crypto: picoxcell - replace strict_strtoul() with kstrtoul()
  crypto: dcp - Staticize local symbols
  crypto: dcp - Use NULL instead of 0
  crypto: dcp - Use devm_* APIs
  crypto: dcp - Remove redundant platform_set_drvdata()
  hwrng: use platform_{get,set}_drvdata()
  crypto: omap-aes - Don't idle/start AES device between Encrypt operations
  crypto: crct10dif - Use PTR_RET
  crypto: ux500 - Cocci spatch "resource_size.spatch"
  crypto: sha256_ssse3 - add sha224 support
  crypto: sha512_ssse3 - add sha384 support
  ...

diff --cc arch/arm/boot/dts/imx28.dtsi
Simple merge

diff --cc drivers/char/hw_random/omap-rng.c
index d2903e7722704843ac254390046b65b5b5540d6c,e5deb99feb28f24ec9dffb62f404cdc2a53f1c9e..6843ec87b98b9f87b3a6ebc3736335d6884826ff
--- 1/drivers/char/hw_random/omap-rng.c
--- 2/drivers/char/hw_random/omap-rng.c
+++ b/drivers/char/hw_random/omap-rng.c
@@@ -116,9 -116,14 +116,9 @@@ static int omap_rng_probe(struct platfo
        };
  
        omap_rng_ops.priv = (unsigned long)priv;
-       dev_set_drvdata(&pdev->dev, priv);
+       platform_set_drvdata(pdev, priv);
  
        priv->mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 -      if (!priv->mem_res) {
 -              ret = -ENOENT;
 -              goto err_ioremap;
 -      }
 -
        priv->base = devm_ioremap_resource(&pdev->dev, priv->mem_res);
        if (IS_ERR(priv->base)) {
                ret = PTR_ERR(priv->base);

diff --cc drivers/crypto/ux500/cryp/cryp_core.c
Simple merge

diff --cc lib/Kconfig
Simple merge