From: Rafael J. Wysocki Date: Fri, 18 Oct 2013 11:41:56 +0000 (+0200) Subject: Merge branch 'pm-fixes' X-Git-Tag: firefly_0821_release~176^2~5130^2~1 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bdbff71653db2da9c69ff29a02764c388649d08d;p=firefly-linux-kernel-4.4.55.git Merge branch 'pm-fixes' * pm-fixes: cpufreq: s3c64xx: Rename index to driver_data intel_pstate: Fix type mismatch warning cpufreq / intel_pstate: Fix max_perf_pct on resume --- bdbff71653db2da9c69ff29a02764c388649d08d