Merge branch 'pm-sleep' into acpi-battery

2026-09-28 19:20:30 +00:00 · 2014-05-30 13:39:53 +02:00 · 2014-05-30 13:39:53 +02:00 · cbcd085da2
commit cbcd085da2
parent 9e50bc14a7 0c5ff0ef80
19 changed files with 400 additions and 181 deletions
--- a/Documentation/ABI/testing/sysfs-power
+++ b/Documentation/ABI/testing/sysfs-power
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/power/devices.txt
+++ b/Documentation/power/devices.txt
--- a/Documentation/power/runtime_pm.txt
+++ b/Documentation/power/runtime_pm.txt
--- a/Documentation/power/states.txt
+++ b/Documentation/power/states.txt
--- a/Documentation/power/swsusp.txt
+++ b/Documentation/power/swsusp.txt
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
--- a/drivers/base/power/wakeup.c
+++ b/drivers/base/power/wakeup.c
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
--- a/drivers/cpuidle/governors/menu.c
+++ b/drivers/cpuidle/governors/menu.c
--- a/include/linux/cpuidle.h
+++ b/include/linux/cpuidle.h
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
--- a/include/linux/pm_runtime.h
+++ b/include/linux/pm_runtime.h
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
--- a/kernel/power/power.h
+++ b/kernel/power/power.h
--- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
--- a/kernel/power/suspend_test.c
+++ b/kernel/power/suspend_test.c
--- a/kernel/sched/idle.c
+++ b/kernel/sched/idle.c