Merge branch 'pm-cpuidle'
authorRafael J. Wysocki <rjw@sisk.pl>
Mon, 17 Sep 2012 18:25:24 +0000 (20:25 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Mon, 17 Sep 2012 18:25:24 +0000 (20:25 +0200)
commit8592013bbd3858e9427ea2c5fb23a2c983b4dcaa
treea03aaef6ccc3f5bb42d7da2d37f7f81ef3854d95
parent00e8b2613331042bbe0177e5b9bb5c8a654b14ae
parented1511b80c92b1b1a8dde567adc090e470a4344a
Merge branch 'pm-cpuidle'

* pm-cpuidle:
  ACPI / processor: remove pointless variable initialization
  ACPI / processor: remove unused function parameter
  cpuidle / ACPI : remove power from acpi_processor_cx structure
  PM / cpuidle: Make ladder governor use the "disabled" state flag
  Honor state disabling in the cpuidle ladder governor