From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Sat, 5 Jan 2013 23:33:22 +0000 (+0100)
Subject: Merge branch 'pm-qos'
X-Git-Tag: firefly_0821_release~3680^2~1296^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=868b093505d6378df77bc2bb656af082330127a8;p=firefly-linux-kernel-4.4.55.git

Merge branch 'pm-qos'

* pm-qos:
  PM / QoS: Rename local variable in dev_pm_qos_add_ancestor_request()
---

868b093505d6378df77bc2bb656af082330127a8