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)
1  2 
drivers/cpufreq/cpufreq.c
drivers/cpufreq/intel_pstate.c
include/linux/cpufreq.h

Simple merge
Simple merge
Simple merge