Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: (21 commits) PM / Hibernate: Reduce autotuned default image size PM / Core: Introduce struct syscore_ops for core subsystems PM PM QoS: Make pm_qos settings readable PM / OPP: opp_find_freq_exact() documentation fix PM: Documentation/power/states.txt: fix repetition PM: Make system-wide PM and runtime PM treat subsystems consistently PM: Simplify kernel/power/Kconfig PM: Add support for device power domains PM: Drop pm_flags that is not necessary PM: Allow pm_runtime_suspend() to succeed during system suspend PM: Clean up PM_TRACE dependencies and drop unnecessary Kconfig option PM: Remove CONFIG_PM_OPS PM: Reorder power management Kconfig options PM: Make CONFIG_PM depend on (CONFIG_PM_SLEEP || CONFIG_PM_RUNTIME) PM / ACPI: Remove references to pm_flags from bus.c PM: Do not create wakeup sysfs files for devices that cannot wake up USB / Hub: Do not call device_set_wakeup_capable() under spinlock PM: Use appropriate printk() priority level in trace.c PM / Wakeup: Don't update events_check_enabled in pm_get_wakeup_count() PM / Wakeup: Make pm_save_wakeup_count() work as documented ...
Showing
- Documentation/ABI/testing/sysfs-devices-power 10 additions, 10 deletionsDocumentation/ABI/testing/sysfs-devices-power
- Documentation/power/devices.txt 66 additions, 28 deletionsDocumentation/power/devices.txt
- Documentation/power/runtime_pm.txt 7 additions, 6 deletionsDocumentation/power/runtime_pm.txt
- Documentation/power/states.txt 6 additions, 6 deletionsDocumentation/power/states.txt
- arch/x86/kernel/apm_32.c 2 additions, 3 deletionsarch/x86/kernel/apm_32.c
- arch/x86/xen/Kconfig 1 addition, 1 deletionarch/x86/xen/Kconfig
- drivers/acpi/Kconfig 0 additions, 1 deletiondrivers/acpi/Kconfig
- drivers/acpi/bus.c 6 additions, 17 deletionsdrivers/acpi/bus.c
- drivers/acpi/sleep.c 2 additions, 2 deletionsdrivers/acpi/sleep.c
- drivers/base/Makefile 1 addition, 1 deletiondrivers/base/Makefile
- drivers/base/power/Makefile 1 addition, 2 deletionsdrivers/base/power/Makefile
- drivers/base/power/main.c 93 additions, 82 deletionsdrivers/base/power/main.c
- drivers/base/power/opp.c 1 addition, 1 deletiondrivers/base/power/opp.c
- drivers/base/power/power.h 10 additions, 11 deletionsdrivers/base/power/power.h
- drivers/base/power/runtime.c 26 additions, 11 deletionsdrivers/base/power/runtime.c
- drivers/base/power/sysfs.c 51 additions, 27 deletionsdrivers/base/power/sysfs.c
- drivers/base/power/trace.c 3 additions, 3 deletionsdrivers/base/power/trace.c
- drivers/base/power/wakeup.c 76 additions, 33 deletionsdrivers/base/power/wakeup.c
- drivers/base/syscore.c 117 additions, 0 deletionsdrivers/base/syscore.c
- drivers/net/e1000e/netdev.c 4 additions, 4 deletionsdrivers/net/e1000e/netdev.c
Loading
Please register or sign in to comment