Merge tag 'pm+acpi-for-3.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 16 Jan 2013 22:34:52 +0000 (14:34 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 16 Jan 2013 22:34:52 +0000 (14:34 -0800)
commit309b51e87905e8a52060dbbab1e427552d5dda9a
tree891aaefe5d347de1b3b1b233fa62b9e576b4e096
parent3a55fb0d9fe8e2f4594329edd58c5fd6f35a99dd
parent8aef33a7cf40ca9da188e8578b2abe7267a38c52
Merge tag 'pm+acpi-for-3.8-rc4' of git://git./linux/kernel/git/rafael/linux-pm

Pull ACPI and power management fixes from Rafael Wysocki:

 - cpuidle regression fix related to the initialization of state
   kobjects from Krzysztof Mazur.

 - cpuidle fix removing some not very useful code and making some
   user-visible problems go away at the same time.  From Daniel Lezcano.

 - ACPI build fix from Yinghai Lu.

* tag 'pm+acpi-for-3.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  cpuidle: remove the power_specified field in the driver
  ACPI / glue: Fix build with ACPI_GLUE_DEBUG set
  cpuidle: fix number of initialized/destroyed states