Merge branch 'pm-runtime' into pm-for-linus
authorRafael J. Wysocki <rjw@sisk.pl>
Sun, 25 Dec 2011 22:43:05 +0000 (23:43 +0100)
committerRafael J. Wysocki <rjw@sisk.pl>
Sun, 25 Dec 2011 22:43:05 +0000 (23:43 +0100)
commit0015afaa1f818d38ea9f8e81a84a6aeeca5fdaf0
tree8f8279cf0117d210230ef9fcacb05f960bf6f8f5
parentb7ba68c4a072c9aa8f04b8cf7838b6cd2f48d918
parent00dc9ad18d707f36b2fb4af98fd2cf0548d2b258
Merge branch 'pm-runtime' into pm-for-linus

* pm-runtime:
  PM / Runtime: Use device PM QoS constraints (v2)
drivers/base/power/runtime.c
include/linux/pm.h