Merge branch 'fixes-next' into linux-next

* fixes-next:
  cpuidle / ACPI: recover percpu ACPI processor cstate
  ACPI / I2C: Use parent's ACPI_HANDLE() in acpi_i2c_register_devices()
  cpufreq: Correct header guards typo
  ACPI / SPI: Use parent's ACPI_HANDLE() in acpi_register_spi_devices()
  cpufreq: check OF node /cpus presence before dereferencing it
  PM / devfreq: Fix compiler warnings for CONFIG_PM_DEVFREQ unset
  PM / QoS: Avoid possible deadlock related to sysfs access
  USB / PM: Don't try to hide PM QoS flags from usb_port_device_release()

Conflicts:
	drivers/cpufreq/cpufreq_governor.h

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

diff --cc drivers/cpufreq/cpufreq_governor.h
index 513cc8234e5e712bff8c527f493c756325e5aede,cc4bd2f6838a30febb93e8bc1f9c55978cb2c19c..65937697cab34fdfa5d72a13239616cb8f0665e0
--- 1/drivers/cpufreq/cpufreq_governor.h
--- 2/drivers/cpufreq/cpufreq_governor.h
+++ b/drivers/cpufreq/cpufreq_governor.h
@@@ -259,8 -173,6 +259,8 @@@ u64 get_cpu_idle_time(unsigned int cpu
  void dbs_check_cpu(struct dbs_data *dbs_data, int cpu);
  bool need_load_eval(struct cpu_dbs_common_info *cdbs,
                unsigned int sampling_rate);
 -int cpufreq_governor_dbs(struct dbs_data *dbs_data,
 -              struct cpufreq_policy *policy, unsigned int event);
 +int cpufreq_governor_dbs(struct cpufreq_policy *policy,
 +              struct common_dbs_data *cdata, unsigned int event);
 +void gov_queue_work(struct dbs_data *dbs_data, struct cpufreq_policy *policy,
 +              unsigned int delay, bool all_cpus);
- #endif /* _CPUFREQ_GOVERNER_H */
+ #endif /* _CPUFREQ_GOVERNOR_H */