Merge branch 'pm-qos'
authorRafael J. Wysocki <rjw@sisk.pl>
Mon, 24 Sep 2012 19:41:31 +0000 (21:41 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Mon, 24 Sep 2012 19:41:31 +0000 (21:41 +0200)
* pm-qos:
  Revert "PM QoS: Use spinlock in the per-device PM QoS constraints code"


Trivial merge