Merge remote-tracking branch 'crypto/master'

Conflicts:
	drivers/char/hw_random/Kconfig
	drivers/crypto/bfin_crc.h

diff --cc drivers/char/hw_random/Kconfig
index 244759bbd7b73d0aa3015c915654abd35ac7a193,38cfae686cc471b71646ab76d6d2ee599ab90fd6..ac6c0f3e2eb28df1318cf4423198d98fb81a6657
--- 1/drivers/char/hw_random/Kconfig
--- 2/drivers/char/hw_random/Kconfig
+++ b/drivers/char/hw_random/Kconfig
@@@ -342,11 -321,12 +321,12 @@@ config HW_RANDOM_TP
          If unsure, say Y.
  
  config HW_RANDOM_MSM
 -      tristate "Qualcomm MSM Random Number Generator support"
 -      depends on ARCH_MSM
 +      tristate "Qualcomm SoCs Random Number Generator support"
-       depends on HW_RANDOM && ARCH_QCOM
++      depends on ARCH_QCOM
+       default HW_RANDOM
        ---help---
          This driver provides kernel-side support for the Random Number
 -        Generator hardware found on Qualcomm MSM SoCs.
 +        Generator hardware found on Qualcomm SoCs.
  
          To compile this driver as a module, choose M here. the
          module will be called msm-rng.