]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'pm-qos' into pm-test
authorRafael J. Wysocki <rjw@sisk.pl>
Tue, 4 Oct 2011 19:55:14 +0000 (21:55 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Tue, 4 Oct 2011 19:55:14 +0000 (21:55 +0200)
commite221cac4b7443e064e3ba0a9116b696c225a6297
tree47294b0ca087b713fff8b97248f0f7a54eb7526c
parent16f9a547d74f72a494377b88690259583b873453
parente3cba3243eb853a052613c804dea033bc4c9cf2d
Merge branch 'pm-qos' into pm-test

* pm-qos:
  PM / QoS: Update Documentation for the pm_qos and dev_pm_qos frameworks
  PM / QoS: Add function dev_pm_qos_read_value() (v3)
drivers/base/power/main.c
include/linux/pm.h