linux-imx

Merge branch 'pm-qos'

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