Merge branch 'pm-qos'
authorRafael J. Wysocki <rjw@sisk.pl>
Sun, 4 Mar 2012 22:11:24 +0000 (23:11 +0100)
committerRafael J. Wysocki <rjw@sisk.pl>
Sun, 4 Mar 2012 22:11:24 +0000 (23:11 +0100)
* pm-qos:
  PM / QoS: unconditionally build the feature
  PM / QoS: Simplify PM QoS expansion/merge


Trivial merge