diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-18 17:39:19 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-18 17:39:19 -0400 |
commit | d9ec0fdc24743cb6aa9b7dee9064455cd26782f9 (patch) | |
tree | db04d8436aee4b2a06373997448650364ba7ffa6 /drivers/ptp | |
parent | 20fb1936dee63fe397236d4ff3fd253a62b7b0b8 (diff) | |
parent | 3735d524da64b70b41c764359da36f88aded3610 (diff) |
Merge tag 'pm-for-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fixes from Rafael J. Wysocki:
- Fixes for three obscure problems in the runtime PM core code found
recently.
- Two fixes for the new "coupled" cpuidle code from Colin Cross and Jon
Medhurst.
- intel_idle driver fix from Konrad Rzeszutek Wilk.
* tag 'pm-for-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
intel_idle: Check cpu_idle_get_driver() for NULL before dereferencing it.
cpuidle: Prevent null pointer dereference in cpuidle_coupled_cpu_notify
cpuidle: coupled: fix sleeping while atomic in cpu notifier
PM / Runtime: Check device PM QoS setting before "no callbacks" check
PM / Runtime: Clear power.deferred_resume on success in rpm_suspend()
PM / Runtime: Fix rpm_resume() return value for power.no_callbacks set
Diffstat (limited to 'drivers/ptp')
0 files changed, 0 insertions, 0 deletions