Merge tag 'pm-for-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management updates from Rafael Wysocki: - ACPI conversion to PM handling based on struct dev_pm_ops. - Conversion of a number of platform drivers to PM handling based on struct dev_pm_ops and removal of empty legacy PM callbacks from a couple of PCI drivers. - Suspend-to-both for in-kernel hibernation from Bojan Smojver. - cpuidle fixes and cleanups from ShuoX Liu, Daniel Lezcano and Preeti Murthy. - cpufreq bug fixes from Jonghwa Lee and Stephen Boyd. - Suspend and hibernate fixes from Srivatsa Bhat and Colin Cross. - Generic PM domains framework updates. - RTC CMOS wakeup signaling update from Paul Fox. - sparse warnings fixes from Sachin Kamat. - Build warnings fixes for the generic PM domains framework and PM sysfs code. - sysfs switch for printing device suspend times from Sameer Nanda. - Documentation fix from Oskar Schirmer. * tag 'pm-for-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (70 commits) cpufreq: Fix sysfs deadlock with concurrent hotplug/frequency switch EXYNOS: bugfix on retrieving old_index from freqs.old PM / Sleep: call early resume handlers when suspend_noirq fails PM / QoS: Use NULL pointer instead of plain integer in qos.c PM / QoS: Use NULL pointer instead of plain integer in pm_qos.h PM / Sleep: Require CAP_BLOCK_SUSPEND to use wake_lock/wake_unlock PM / Sleep: Add missing static storage class specifiers in main.c cpuilde / ACPI: remove time from acpi_processor_cx structure cpuidle / ACPI: remove usage from acpi_processor_cx structure cpuidle / ACPI : remove latency_ticks from acpi_processor_cx structure rtc-cmos: report wakeups from interrupt handler PM / Sleep: Fix build warning in sysfs.c for CONFIG_PM_SLEEP unset PM / Domains: Fix build warning for CONFIG_PM_RUNTIME unset olpc-xo15-sci: Use struct dev_pm_ops for power management PM / Domains: Replace plain integer with NULL pointer in domain.c file PM / Domains: Add missing static storage class specifier in domain.c file PM / crypto / ux500: Use struct dev_pm_ops for power management PM / IPMI: Remove empty legacy PCI PM callbacks tpm_nsc: Use struct dev_pm_ops for power management tpm_tis: Use struct dev_pm_ops for power management ...
Showing
- Documentation/ABI/testing/sysfs-power 13 additions, 0 deletionsDocumentation/ABI/testing/sysfs-power
- Documentation/power/devices.txt 5 additions, 4 deletionsDocumentation/power/devices.txt
- Documentation/power/swsusp.txt 5 additions, 0 deletionsDocumentation/power/swsusp.txt
- arch/x86/platform/olpc/olpc-xo15-sci.c 4 additions, 2 deletionsarch/x86/platform/olpc/olpc-xo15-sci.c
- drivers/acpi/ac.c 12 additions, 5 deletionsdrivers/acpi/ac.c
- drivers/acpi/battery.c 11 additions, 4 deletionsdrivers/acpi/battery.c
- drivers/acpi/button.c 6 additions, 3 deletionsdrivers/acpi/button.c
- drivers/acpi/fan.c 11 additions, 10 deletionsdrivers/acpi/fan.c
- drivers/acpi/power.c 8 additions, 4 deletionsdrivers/acpi/power.c
- drivers/acpi/processor_driver.c 4 additions, 9 deletionsdrivers/acpi/processor_driver.c
- drivers/acpi/processor_idle.c 3 additions, 40 deletionsdrivers/acpi/processor_idle.c
- drivers/acpi/sbs.c 6 additions, 4 deletionsdrivers/acpi/sbs.c
- drivers/acpi/scan.c 0 additions, 22 deletionsdrivers/acpi/scan.c
- drivers/acpi/thermal.c 10 additions, 7 deletionsdrivers/acpi/thermal.c
- drivers/base/power/domain.c 268 additions, 74 deletionsdrivers/base/power/domain.c
- drivers/base/power/main.c 18 additions, 8 deletionsdrivers/base/power/main.c
- drivers/base/power/qos.c 1 addition, 1 deletiondrivers/base/power/qos.c
- drivers/base/power/sysfs.c 4 additions, 0 deletionsdrivers/base/power/sysfs.c
- drivers/block/mg_disk.c 7 additions, 6 deletionsdrivers/block/mg_disk.c
- drivers/char/hw_random/omap-rng.c 7 additions, 6 deletionsdrivers/char/hw_random/omap-rng.c
Loading
Please register or sign in to comment