From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 9 Dec 2013 17:29:42 +0000 (-0800)
Subject: Merge tag 'pm-3.13-rc3-fixup' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Tag: firefly_0821_release~176^2~4809
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=77bd2adb97271c5f2237cfacf5984cc810033131;p=firefly-linux-kernel-4.4.55.git

Merge tag 'pm-3.13-rc3-fixup' of git://git./linux/kernel/git/rafael/linux-pm

Pull power management fixup from Rafael Wysocki:
 "This reverts two cpufreq commits that fixed issues for some people,
  but broke things for others, so revert them and we'll need to fix the
  original problems differently"

* tag 'pm-3.13-rc3-fixup' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  Revert "cpufreq: fix garbage kobjects on errors during suspend/resume"
  Revert "cpufreq: suspend governors on system suspend/hibernate"
---

77bd2adb97271c5f2237cfacf5984cc810033131