diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-09 17:29:42 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-09 17:29:42 (GMT) |
commit | 77bd2adb97271c5f2237cfacf5984cc810033131 (patch) | |
tree | 77b30ef19a5d0581c02e3d23c553492c1c277c25 /drivers/staging | |
parent | 754ac45745711a7ce0067087e5b55a9c277952ad (diff) | |
parent | d4faadd5d5b368a7051fef374ee933ec3606713b (diff) | |
download | linux-fsl-qoriq-77bd2adb97271c5f2237cfacf5984cc810033131.tar.xz |
Merge tag 'pm-3.13-rc3-fixup' of git://git.kernel.org/pub/scm/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"
Diffstat (limited to 'drivers/staging')
0 files changed, 0 insertions, 0 deletions