]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'pm-cpuidle-next' into pm-shmobile-next
authorRafael J. Wysocki <rjw@sisk.pl>
Wed, 22 Aug 2012 10:27:20 +0000 (12:27 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Wed, 22 Aug 2012 10:27:20 +0000 (12:27 +0200)
* pm-cpuidle-next:
  PM / cpuidle: Make ladder governor use the "disabled" state flag
  Honor state disabling in the cpuidle ladder governor


Trivial merge