]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'pm-runtime' into pm-test
authorRafael J. Wysocki <rjw@sisk.pl>
Mon, 26 Sep 2011 18:37:42 +0000 (20:37 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Mon, 26 Sep 2011 18:37:42 +0000 (20:37 +0200)
* pm-runtime:
  PM / Runtime: Don't run callbacks under lock for power.irq_safe set
  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