Merge branch 'pm-cpufreq-sched' into pm-cpufreq
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 1 Oct 2016 23:42:33 +0000 (01:42 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 1 Oct 2016 23:42:33 +0000 (01:42 +0200)
1  2 
drivers/cpufreq/Kconfig
drivers/cpufreq/intel_pstate.c

Simple merge
Simple merge