]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'pm-devfreq-next' into linux-next
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 26 Oct 2012 10:29:09 +0000 (12:29 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 26 Oct 2012 10:29:09 +0000 (12:29 +0200)
* pm-devfreq-next:
  PM / devfreq: make devfreq_class static
  PM / devfreq: fix sscanf handling for writable sysfs entries
  PM / devfreq: kernel-doc typo corrections
  PM / devfreq: Add current freq callback in device profile
  PM / devfreq: Add suspend and resume apis
  PM / devfreq: Core updates to support devices which can idle


Trivial merge