From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Sun, 9 Sep 2012 20:10:33 +0000 (+0200)
Subject: Merge branch 'pm-cpuidle' into linux-next
X-Git-Tag: next-20120910~41^2~6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=49c4ad91c813fea21c2b303b0c21f6bc1945a781;p=karo-tx-linux.git

Merge branch 'pm-cpuidle' into linux-next

* pm-cpuidle:
  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
---

49c4ad91c813fea21c2b303b0c21f6bc1945a781