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)
commited819e3b964bba8bfae8e65d4d55a3f345f8da16
tree345c6e010750627224ac8c64ad9be06692e5e273
parent48ed00031681c373ff81e78fd248710fe4cddda0
parenta9b542ee607a8afafa9447292394959fc84ea650
Merge branch 'pm-qos'

* pm-qos:
  PM / QoS: unconditionally build the feature
  PM / QoS: Simplify PM QoS expansion/merge