tree 793d0fc86ecf98331024db5c86bc271cc72aa2d2
parent 3ee72ca99288f1de95ec9c570e43f531c8799f06
parent 2a5306cc5f383b0e7414c75e458111afd4a563a4
author Rafael J. Wysocki <rjw@sisk.pl> 1318022215 +0200
committer Rafael J. Wysocki <rjw@sisk.pl> 1318022215 +0200

Merge branch 'pm-runtime' into pm-for-linus

* pm-runtime:
  PM / Tracing: build rpm-traces.c only if CONFIG_PM_RUNTIME is set
  PM / Runtime: Replace dev_dbg() with trace_rpm_*()
  PM / Runtime: Introduce trace points for tracing rpm_* functions
  PM / Runtime: Don't run callbacks under lock for power.irq_safe set
  USB: Add wakeup info to debugging messages
  PM / Runtime: pm_runtime_idle() can be called in atomic context
  PM / Runtime: Add macro to test for runtime PM events
  PM / Runtime: Add might_sleep() to runtime PM functions