From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Sun, 4 Mar 2012 22:11:24 +0000 (+0100)
Subject: Merge branch 'pm-qos'
X-Git-Tag: firefly_0821_release~3680^2~3334^2~5
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ed819e3b964bba8bfae8e65d4d55a3f345f8da16;p=firefly-linux-kernel-4.4.55.git

Merge branch 'pm-qos'

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

ed819e3b964bba8bfae8e65d4d55a3f345f8da16