]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'pm-runtime' into pm-for-linus
authorRafael J. Wysocki <rjw@sisk.pl>
Fri, 7 Oct 2011 21:16:55 +0000 (23:16 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Fri, 7 Oct 2011 21:16:55 +0000 (23:16 +0200)
commitf2e6620a32b6ea3b9b379634df6d5a12674db404
tree793d0fc86ecf98331024db5c86bc271cc72aa2d2
parentf0faa1eaf87130052990196eac13d35ebe53a458
parentb723681d081e8a059c7d0116f931c9d1e742b8e1
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
Documentation/power/runtime_pm.txt
drivers/bluetooth/btusb.c
drivers/usb/core/hcd.c
sound/usb/card.c