Merge branch 'pm-devfreq' into pm-for-linus
authorRafael J. Wysocki <rjw@sisk.pl>
Fri, 7 Oct 2011 21:17:18 +0000 (23:17 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Fri, 7 Oct 2011 21:17:18 +0000 (23:17 +0200)
* pm-devfreq:
  PM / devfreq: Add basic governors
  PM / devfreq: Add common sysfs interfaces
  PM: Introduce devfreq: generic DVFS framework with device-specific OPPs
  PM / OPP: Add OPP availability change notifier.


Trivial merge