From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Wed, 2 Oct 2013 16:06:29 +0000 (+0200)
Subject: Merge branch 'pm-cpufreq-fixes' into pm-fixes
X-Git-Tag: v3.12-rc4~11^2^2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=19ea1a4400e9b8a3858c358509e2514d4eef785f;p=~emulex%2Finfiniband.git

Merge branch 'pm-cpufreq-fixes' into pm-fixes

* pm-cpufreq-fixes:
  intel_pstate: fix no_turbo
  cpufreq: cpufreq-cpu0: NULL is a valid regulator, part 2
  cpufreq: SPEAr: Fix incorrect variable type
---

19ea1a4400e9b8a3858c358509e2514d4eef785f