From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 6 Dec 2013 01:17:59 +0000 (+0100)
Subject: Merge branches 'pm-cpuidle' and 'pm-cpufreq'
X-Git-Tag: v3.13-rc3~6^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7cdcec991c06cd6d792b304851cc245cfec507a7;p=pandora-kernel.git

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

* pm-cpuidle:
  cpuidle: Check for dev before deregistering it.
  intel_idle: Fixed C6 state on Avoton/Rangeley processors

* pm-cpufreq:
  cpufreq: fix garbage kobjects on errors during suspend/resume
  cpufreq: suspend governors on system suspend/hibernate
---

7cdcec991c06cd6d792b304851cc245cfec507a7
Reading git-diff-tree failed