From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Thu, 29 Sep 2011 20:07:49 +0000 (+0200)
Subject: Merge branch 'pm-runtime' into pm-test
X-Git-Tag: next-20110930~28^2~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7a2a4b01be4ea536eb451914db274f5fc0d79c83;p=karo-tx-linux.git

Merge branch 'pm-runtime' into pm-test

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

7a2a4b01be4ea536eb451914db274f5fc0d79c83