summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-06-29 19:05:41 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-06-29 19:05:41 -0700
commit02529ba26f444e2a214c3dcacd866928e9edcfc0 (patch)
tree967038230377c4a0e495258dd38e904faba958fb /kernel
parent15114c7e1cf41e7e3a792b1cf6b815b947ef6d1e (diff)
parent75cc52358799bd6001e7d1a47847f997f5ae99f0 (diff)
Merge tag 'pm-for-3.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fixes from Rafael J. Wysocki: * Fix for a bug in async suspend error code path causing parents to wait forever for their children in case of a suspend error from Mandeep Singh Baines (-stable metarial). * Fix for a suspend regression related to earlier changes in the ACPI cpuidle driver from Deepthi Dharwar. * tag 'pm-for-3.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: PM / ACPI: Fix suspend/resume regression caused by cpuidle cleanup. PM / Sleep: Prevent waiting forever on asynchronous suspend after abort
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions