Merge branch 'pm-qos'

* pm-qos:
  Revert "PM QoS: Use spinlock in the per-device PM QoS constraints code"