Merge branch 'pm-cpuidle' into pm-shmobile
authorRafael J. Wysocki <rjw@sisk.pl>
Mon, 3 Sep 2012 23:45:50 +0000 (01:45 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Mon, 3 Sep 2012 23:45:50 +0000 (01:45 +0200)
* pm-cpuidle:
  PM / cpuidle: Make ladder governor use the "disabled" state flag
  Honor state disabling in the cpuidle ladder governor


Trivial merge