Merge back earlier cpufreq material.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 3 Jun 2014 13:03:27 +0000 (15:03 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 3 Jun 2014 13:03:27 +0000 (15:03 +0200)
commit5ece2399181a5abaf42a4cb607463770686778e6
tree5c789755fce670511f2ac1bc3eebf39e26ed1724
parentbf8102228a8bf053051f311e5486042fe0542894
parent8d65775d17941d6d41f5913fc6a99a134c588e01
Merge back earlier cpufreq material.

Conflicts:
arch/mips/loongson/lemote-2f/clock.c
drivers/cpufreq/intel_pstate.c
MAINTAINERS
drivers/cpufreq/intel_pstate.c