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)
commit0ed537b5fd18c38b526fd0e6837a00f96aee30c4
tree01744d89b09aaaaad77696265fb4732ef9a8fc32
parent72e624de6e6f0d5a638fbc23842aa76ae048e9e7
parent50a3cb04a5f9cd5323a76db9ee409a7f3004259a
Merge branch 'pm-opp' into pm-cpufreq
drivers/cpufreq/cpufreq.c
include/linux/cpufreq.h