Merge branch 'i7300_idle' into test

diff --combined MAINTAINERS
index 4b7d8f291cd4a043dff37ec9fd66b45269fcfc9f,43f71b0d2a2bc7c1e58ff06b09fba44eeda30854..5edb541c2fadf4571ff0123ae81f39336314b2e7
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1415,8 -1415,8 +1415,8 @@@ M:      rdunlap@xenotime.ne
  S:    Maintained
  
  DOCKING STATION DRIVER
 -P:    Kristen Carlson Accardi
 -M:    kristen.c.accardi@intel.com
 +P:    Shaohua Li
 +M:    shaohua.li@intel.com
  L:    linux-acpi@vger.kernel.org
  S:    Supported
  
@@@ -2078,6 -2078,12 +2078,12 @@@ L:    linux-ide@vger.kernel.or
  L:    linux-scsi@vger.kernel.org
  S:    Orphan
  
+ IDLE-I7300
+ P:    Andy Henroid
+ M:    andrew.d.henroid@intel.com
+ L:    linux-pm@lists.linux-foundation.org
+ S:    Supported
+ 
  IEEE 1394 SUBSYSTEM (drivers/ieee1394)
  P:    Ben Collins
  M:    ben.collins@ubuntu.com

diff --combined arch/x86/Kconfig
index f8caf040650ef0d45b72912de5d0fc3577c57b9e,19cdfe1f237aaaa385dc46102ae151a756f2ec49..540a78242034af44b6f6ad38bb4d6f0b781bb729
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -123,9 -123,6 +123,9 @@@ config GENERIC_TIME_VSYSCAL
  config ARCH_HAS_CPU_RELAX
        def_bool y
  
 +config ARCH_HAS_DEFAULT_IDLE
 +      def_bool y
 +
  config ARCH_HAS_CACHE_LINE_SIZE
        def_bool y
  
@@@ -1539,6 -1536,8 +1539,8 @@@ source "arch/x86/kernel/cpu/cpufreq/Kco
  
  source "drivers/cpuidle/Kconfig"
  
+ source "drivers/idle/Kconfig"
+ 
  endmenu