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)
commitb6e251178286eff8bbd2c01a1b6aa7a317eb3c67
treeb3ee0ea366e7754afd8ecde9ee98fd6f8bead983
parent9ad0a1b6a21fbfa0b308e704fd924836f7ae4458
parent3ba7bcaa3657f5fe32295ebd17fbdaaf16608e2f
Merge branch 'pm-cpufreq-sched' into pm-cpufreq
drivers/cpufreq/Kconfig
drivers/cpufreq/intel_pstate.c