linux-imx

Merge branch 'pm-qos'

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