From: Rafael J. Wysocki Date: Tue, 2 Apr 2013 13:35:05 +0000 (+0200) Subject: Merge branch 'fixes-next' into linux-next X-Git-Tag: next-20130404~78^2~2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2b6a34fdc364277939321e9831f3d724047a9867;p=karo-tx-linux.git 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 --- 2b6a34fdc364277939321e9831f3d724047a9867 diff --cc drivers/cpufreq/cpufreq_governor.h index 513cc8234e5e,cc4bd2f6838a..65937697cab3 --- a/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 */