Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

diff --combined arch/sh/Kconfig
index a164c9e,74495a5..f03338c
--- 1/arch/sh/Kconfig
--- 2/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@@ -71,12 -71,6 +71,6 @@@ config GENERIC_CSU
        def_bool y
        depends on SUPERH64
  
- config GENERIC_FIND_NEXT_BIT
-       def_bool y
- 
- config GENERIC_FIND_BIT_LE
-       def_bool y
- 
  config GENERIC_HWEIGHT
        def_bool y
  
@@@ -167,7 -161,7 +161,7 @@@ config ARCH_HAS_CPU_IDLE_WAI
  
  config NO_IOPORT
        def_bool !PCI
 -      depends on !SH_CAYMAN && !SH_SH4202_MICRODEV
 +      depends on !SH_CAYMAN && !SH_SH4202_MICRODEV && !SH_SHMIN
  
  config IO_TRAPPED
        bool