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

Pull crypto update from Herbert Xu:
 "Here is the crypto update for 3.12:

   - Added MODULE_SOFTDEP to allow pre-loading of modules.
   - Reinstated crct10dif driver using the module softdep feature.
   - Allow via rng driver to be auto-loaded.

   - Split large input data when necessary in nx.
   - Handle zero length messages correctly for GCM/XCBC in nx.
   - Handle SHA-2 chunks bigger than block size properly in nx.

   - Handle unaligned lengths in omap-aes.
   - Added SHA384/SHA512 to omap-sham.
   - Added OMAP5/AM43XX SHAM support.
   - Added OMAP4 TRNG support.

   - Misc fixes"

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (66 commits)
  Reinstate "crypto: crct10dif - Wrap crc_t10dif function all to use crypto transform framework"
  hwrng: via - Add MODULE_DEVICE_TABLE
  crypto: fcrypt - Fix bitoperation for compilation with clang
  crypto: nx - fix SHA-2 for chunks bigger than block size
  crypto: nx - fix GCM for zero length messages
  crypto: nx - fix XCBC for zero length messages
  crypto: nx - fix limits to sg lists for AES-CCM
  crypto: nx - fix limits to sg lists for AES-XCBC
  crypto: nx - fix limits to sg lists for AES-GCM
  crypto: nx - fix limits to sg lists for AES-CTR
  crypto: nx - fix limits to sg lists for AES-CBC
  crypto: nx - fix limits to sg lists for AES-ECB
  crypto: nx - add offset to nx_build_sg_lists()
  padata - Register hotcpu notifier after initialization
  padata - share code between CPU_ONLINE and CPU_DOWN_FAILED, same to CPU_DOWN_PREPARE and CPU_UP_CANCELED
  hwrng: omap - reorder OMAP TRNG driver code
  crypto: omap-sham - correct dma burst size
  crypto: omap-sham - Enable Polling mode if DMA fails
  crypto: tegra-aes - bitwise vs logical and
  crypto: sahara - checking the wrong variable
  ...

diff --combined arch/arm/mach-omap2/devices.c
index 73ae7536a32b7bd24040e385dc218027e5b7c600,afc201713131a5941e4d61b85488aac178a2eab7..5c5315ba129b705b4af0c6b9f8af38e217e922cd
--- 1/arch/arm/mach-omap2/devices.c
--- 2/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@@ -327,6 -327,44 +327,6 @@@ static void omap_init_audio(void
  static inline void omap_init_audio(void) {}
  #endif
  
 -#if defined(CONFIG_SND_OMAP_SOC_MCPDM) || \
 -              defined(CONFIG_SND_OMAP_SOC_MCPDM_MODULE)
 -
 -static void __init omap_init_mcpdm(void)
 -{
 -      struct omap_hwmod *oh;
 -      struct platform_device *pdev;
 -
 -      oh = omap_hwmod_lookup("mcpdm");
 -      if (!oh)
 -              return;
 -
 -      pdev = omap_device_build("omap-mcpdm", -1, oh, NULL, 0);
 -      WARN(IS_ERR(pdev), "Can't build omap_device for omap-mcpdm.\n");
 -}
 -#else
 -static inline void omap_init_mcpdm(void) {}
 -#endif
 -
 -#if defined(CONFIG_SND_OMAP_SOC_DMIC) || \
 -              defined(CONFIG_SND_OMAP_SOC_DMIC_MODULE)
 -
 -static void __init omap_init_dmic(void)
 -{
 -      struct omap_hwmod *oh;
 -      struct platform_device *pdev;
 -
 -      oh = omap_hwmod_lookup("dmic");
 -      if (!oh)
 -              return;
 -
 -      pdev = omap_device_build("omap-dmic", -1, oh, NULL, 0);
 -      WARN(IS_ERR(pdev), "Can't build omap_device for omap-dmic.\n");
 -}
 -#else
 -static inline void omap_init_dmic(void) {}
 -#endif
 -
  #if defined(CONFIG_SND_OMAP_SOC_OMAP_HDMI) || \
                defined(CONFIG_SND_OMAP_SOC_OMAP_HDMI_MODULE)
  
@@@ -527,15 -565,17 +527,15 @@@ static int __init omap2_init_devices(vo
        omap_init_mbox();
        /* If dtb is there, the devices will be created dynamically */
        if (!of_have_populated_dt()) {
 -              omap_init_dmic();
 -              omap_init_mcpdm();
                omap_init_mcspi();
                omap_init_sham();
                omap_init_aes();
+               omap_init_rng();
        } else {
                /* These can be removed when bindings are done */
                omap_init_wl12xx_of();
        }
        omap_init_sti();
-       omap_init_rng();
        omap_init_vout();
  
        return 0;

diff --combined lib/Kconfig
index 65561716c16c4345a8e9ab00db9655ffa95a62de,35da51359d404180c8214c007195e97ca89563dd..b3c8be0da17f8472429ad79787c76d42fa62eb02
--- 1/lib/Kconfig
--- 2/lib/Kconfig
+++ b/lib/Kconfig
@@@ -48,16 -48,6 +48,16 @@@ config STMP_DEVIC
  config PERCPU_RWSEM
        boolean
  
 +config ARCH_USE_CMPXCHG_LOCKREF
 +      bool
 +
 +config CMPXCHG_LOCKREF
 +      def_bool y if ARCH_USE_CMPXCHG_LOCKREF
 +      depends on SMP
 +      depends on !GENERIC_LOCKBREAK
 +      depends on !DEBUG_SPINLOCK
 +      depends on !DEBUG_LOCK_ALLOC
 +
  config CRC_CCITT
        tristate "CRC-CCITT functions"
        help
@@@ -76,6 -66,8 +76,8 @@@ config CRC1
  
  config CRC_T10DIF
        tristate "CRC calculation for the T10 Data Integrity Field"
+       select CRYPTO
+       select CRYPTO_CRCT10DIF
        help
          This option is only needed if a module that's not in the
          kernel tree needs to calculate CRC checks for use with the