From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Mon, 17 Sep 2012 18:25:24 +0000 (+0200)
Subject: Merge branch 'pm-cpuidle'
X-Git-Tag: v3.7-rc1~137^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8592013bbd3858e9427ea2c5fb23a2c983b4dcaa;p=thirdparty%2Fkernel%2Flinux.git

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
---

8592013bbd3858e9427ea2c5fb23a2c983b4dcaa