Merge branch 'pm-opp' into pm-cpufreq
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 3 Sep 2015 00:46:01 +0000 (02:46 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 3 Sep 2015 00:46:01 +0000 (02:46 +0200)
1  2 
drivers/cpufreq/cpufreq.c
include/linux/cpufreq.h

Simple merge
Simple merge