Merge branch 'pm-cpufreq'

* pm-cpufreq:
  cpufreq: Make cpufreq_generic_init() return void
  cpufreq: imx-cpufreq-dt: Add i.MX8MN support
  cpufreq: Add QoS requests for userspace constraints
  cpufreq: intel_pstate: Reuse refresh_frequency_limits()
  cpufreq: Register notifiers with the PM QoS framework
  PM / QoS: Add support for MIN/MAX frequency constraints
  PM / QOS: Pass request type to dev_pm_qos_read_value()
  PM / QOS: Rename __dev_pm_qos_read_value() and dev_pm_qos_raw_read_value()
  PM / QOS: Pass request type to dev_pm_qos_{add|remove}_notifier()

diff --cc drivers/cpufreq/cpufreq.c
Simple merge

diff --cc drivers/cpufreq/davinci-cpufreq.c
Simple merge

diff --cc drivers/cpufreq/imx6q-cpufreq.c
Simple merge

diff --cc drivers/cpufreq/maple-cpufreq.c
Simple merge

diff --cc drivers/cpufreq/omap-cpufreq.c
Simple merge

diff --cc drivers/cpufreq/pmac32-cpufreq.c
Simple merge

diff --cc drivers/cpufreq/pmac64-cpufreq.c
Simple merge

diff --cc drivers/cpufreq/s3c2416-cpufreq.c
Simple merge

diff --cc drivers/cpufreq/s3c64xx-cpufreq.c
Simple merge

diff --cc drivers/cpufreq/s5pv210-cpufreq.c
Simple merge

diff --cc drivers/cpufreq/sa1110-cpufreq.c
Simple merge

diff --cc include/linux/cpufreq.h
Simple merge