From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Fri, 7 Oct 2011 21:16:55 +0000 (+0200)
Subject: Merge branch 'pm-runtime' into pm-for-linus
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d727b60659a1173eb4142a5fc521ce67c28b34e1;p=linux-beck.git

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
---

d727b60659a1173eb4142a5fc521ce67c28b34e1