tree 5c789755fce670511f2ac1bc3eebf39e26ed1724
parent bf8102228a8bf053051f311e5486042fe0542894
parent 8d65775d17941d6d41f5913fc6a99a134c588e01
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1401800607 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1401800607 +0200

Merge back earlier cpufreq material.

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