From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 29 Dec 2014 20:23:41 +0000 (+0100)
Subject: Merge branches 'pm-cpufreq' and 'pm-cpuidle'
X-Git-Tag: fixes-v4.0-rc1~361^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff23ab2441e7ba5089e8631bad3a6569e7b6d5b8;p=pandora-kernel.git

Merge branches 'pm-cpufreq' and 'pm-cpuidle'

* pm-cpufreq:
  cpufreq: fix a NULL pointer dereference in __cpufreq_governor()
  cpufreq-dt: defer probing if OPP table is not ready

* pm-cpuidle:
  cpuidle / ACPI: remove unused CPUIDLE_FLAG_TIME_INVALID
  cpuidle: ladder: Better idle duration measurement without using CPUIDLE_FLAG_TIME_INVALID
  cpuidle: menu: Better idle duration measurement without using CPUIDLE_FLAG_TIME_INVALID
---

ff23ab2441e7ba5089e8631bad3a6569e7b6d5b8
Reading git-diff-tree failed