]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'pm-cpufreq-governor' into pm-cpufreq
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 10 Mar 2016 19:46:03 +0000 (20:46 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 10 Mar 2016 19:46:03 +0000 (20:46 +0100)
commita5acbfbd70bc6a0cd4c8ca8f4f5e52ac3ee7dca4
tree5e4560aaaaf2dec73a25bf448e0dd73ded4f9117
parentedd4a893e097d744e8069acf585f8b02dbbc9134
parentadaf9fcd136970e480d7ca834c0cf25ce922ea74
Merge branch 'pm-cpufreq-governor' into pm-cpufreq
drivers/cpufreq/cpufreq.c
drivers/cpufreq/intel_pstate.c
include/linux/cpufreq.h