]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'pm-runtime' into pm-test
authorRafael J. Wysocki <rjw@sisk.pl>
Thu, 29 Sep 2011 20:07:49 +0000 (22:07 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Thu, 29 Sep 2011 20:07:49 +0000 (22:07 +0200)
commit7a2a4b01be4ea536eb451914db274f5fc0d79c83
treee7dbee95f2a2e31dfb2c8d390d0a899086827ba8
parenta102a9ece5489e1718cd7543aa079082450ac3a2
parent2a5306cc5f383b0e7414c75e458111afd4a563a4
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
Documentation/power/runtime_pm.txt
drivers/bluetooth/btusb.c
drivers/usb/core/hcd.c
sound/usb/card.c