]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'pm-cpuidle' into linux-next
authorRafael J. Wysocki <rjw@sisk.pl>
Sun, 9 Sep 2012 20:10:33 +0000 (22:10 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Sun, 9 Sep 2012 20:10:33 +0000 (22:10 +0200)
commit49c4ad91c813fea21c2b303b0c21f6bc1945a781
treead607e5b076ee3cac7cee771a0aa0b281393c567
parent54359f8da17b8d43d27513d654dedb82f80f4b74
parentc59687f8466df36633d937cc298aad465d704990
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