]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'pm-domains' into linux-next
authorRafael J. Wysocki <rjw@sisk.pl>
Thu, 1 Dec 2011 20:50:53 +0000 (21:50 +0100)
committerRafael J. Wysocki <rjw@sisk.pl>
Thu, 1 Dec 2011 20:50:53 +0000 (21:50 +0100)
* pm-domains:
  PM / Domains: fix compilation failure for CONFIG_PM_GENERIC_DOMAINS unset
  PM / Domains: Automatically update overoptimistic latency information
  PM / Domains: Add default power off governor function (v4)
  PM / Domains: Add device stop governor function (v4)
  PM / Domains: Rework system suspend callback routines (v2)
  PM / Domains: Introduce "save/restore state" device callbacks
  PM / Domains: Make it possible to use per-device domain callbacks


Trivial merge