tree 1729332ebab51bb560ca64effe46cdab38ab537f
parent 405a1086bdd091d2d55db0ac905cd6332b35cec1
parent f5ce1572109049b90484e2bb44927cb6034c5eb1
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1372417300 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1372417300 +0200

Merge branch 'pm-assorted'

* pm-assorted:
  PM / QoS: Add pm_qos and dev_pm_qos to events-power.txt
  PM / QoS: Add dev_pm_qos_request tracepoints
  PM / QoS: Add pm_qos_request tracepoints
  PM / QoS: Add pm_qos_update_target/flags tracepoints
  PM / QoS: Update Documentation/power/pm_qos_interface.txt
  PM / Sleep: Print last wakeup source on failed wakeup_count write
  PM / QoS: correct the valid range of pm_qos_class
  PM / wakeup: Adjust messaging for wake events during suspend
  PM / Runtime: Update .runtime_idle() callback documentation
  PM / Runtime: Rework the "runtime idle" helper routine
  PM / Hibernate: print physical addresses consistently with other parts of kernel