summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-06-03 13:03:27 (GMT)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-06-03 13:03:27 (GMT)
commit5ece2399181a5abaf42a4cb607463770686778e6 (patch)
tree5c789755fce670511f2ac1bc3eebf39e26ed1724 /mm
parentbf8102228a8bf053051f311e5486042fe0542894 (diff)
parent8d65775d17941d6d41f5913fc6a99a134c588e01 (diff)
downloadlinux-5ece2399181a5abaf42a4cb607463770686778e6.tar.xz
Merge back earlier cpufreq material.
Conflicts: arch/mips/loongson/lemote-2f/clock.c drivers/cpufreq/intel_pstate.c
Diffstat (limited to 'mm')
0 files changed, 0 insertions, 0 deletions