Merge branch 'pm-cpuidle'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 17 Jan 2014 00:56:47 +0000 (01:56 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 17 Jan 2014 00:56:47 +0000 (01:56 +0100)
commit9612a461c1e48f75ca1e1f0faf9c928761baae5b
tree19b80da3e4cabca51dcbc5a4f7432312ea251351
parent4ff913373a77b99cbe3c5df3c76d2622006200d6
parent4955a5412cad83da6e994d939bdb4f7887e4585e
Merge branch 'pm-cpuidle'

* pm-cpuidle:
  intel_idle: remove superfluous dev->state_count initialization
  intel_idle: do C1E promotion disable quirk for hotplugged CPUs
  ACPI / cpuidle: remove dev->state_count setting
  ACPI / cpuidle: fix max idle state handling with hotplug CPU support
  POWERPC: pseries: cpuidle: use the common cpuidle_[un]register() routines
  POWERPC: pseries: cpuidle: remove superfluous dev->state_count initialization
  ARM: EXYNOS: cpuidle: fix AFTR mode check
drivers/acpi/processor_idle.c