Merge branch 'pm-cpuidle'

* pm-cpuidle:
  cpuidle: remove state_count field from struct cpuidle_device
  intel_idle: use the common cpuidle_[un]register() routines
  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

diff --cc drivers/acpi/processor_idle.c
Simple merge