Merge branch 'pm-qos'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 5 Jan 2013 23:33:22 +0000 (00:33 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 5 Jan 2013 23:33:22 +0000 (00:33 +0100)
commit868b093505d6378df77bc2bb656af082330127a8
tree58a022cbe3a57325e781d13c4c1c8347a34f7daa
parentf3ea36aa87400baafd17d548a873de5fe1ecdfcd
parent4ce4780270b69a0f4ce81887c2ef864c04cb7f9f
Merge branch 'pm-qos'

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