Merge branch 'pm-runtime' into pm-for-linus
Rafael J. Wysocki [Fri, 7 Oct 2011 21:16:55 +0000 (23:16 +0200)]
* 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

1  2 
Documentation/power/runtime_pm.txt
drivers/bluetooth/btusb.c
drivers/usb/core/hcd.c
sound/usb/card.c

Simple merge
Simple merge
Simple merge
Simple merge