summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-08-05 15:46:55 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-08-05 15:46:55 +0200
commite2b3b80de5cda284c885721e873f9a6e90f68ef8 (patch)
tree2a90e61b73fc4640280e1f32d7626449ffea45a3 /arch
parent601f887d6105ddd28dc569a1504595bdf8df8a5b (diff)
parentc226fab474291e3c6ac5fa30a2b0778acc311e61 (diff)
parent79ad70de539c58883098f9f4ed6312dd7f6c2fef (diff)
parent4f48ec8a1c070f00c3d675b664e8b3879e5286e5 (diff)
parent067b7ce083df6c69e67345bdba658ab59274cc01 (diff)
Merge branches 'pm-sleep', 'pm-cpufreq', 'pm-core' and 'pm-opp'
* pm-sleep: x86/power/64: Do not refer to __PAGE_OFFSET from assembly code * pm-cpufreq: cpufreq: Do not default-yes CPU_FREQ_STAT cpufreq: intel_pstate: Add more out-of-band IDs * pm-core: PM-wakeup: Delete unnecessary checks before three function calls * pm-opp: PM / OPP: optimize dev_pm_opp_set_rate() performance a bit