diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-25 09:18:39 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-25 09:18:39 -0400 |
commit | 7e0bb71e75020348bee523720a0c2f04cc72f540 (patch) | |
tree | 1a22d65bbce34e8cc0f82c543c9486ffb58332f7 /MAINTAINERS | |
parent | b9e2780d576a010d4aba1e69f247170bf3718d6b (diff) | |
parent | 0ab1e79b825a5cd8aeb3b34d89c9a89dea900056 (diff) |
Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
* 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (63 commits)
PM / Clocks: Remove redundant NULL checks before kfree()
PM / Documentation: Update docs about suspend and CPU hotplug
ACPI / PM: Add Sony VGN-FW21E to nonvs blacklist.
ARM: mach-shmobile: sh7372 A4R support (v4)
ARM: mach-shmobile: sh7372 A3SP support (v4)
PM / Sleep: Mark devices involved in wakeup signaling during suspend
PM / Hibernate: Improve performance of LZO/plain hibernation, checksum image
PM / Hibernate: Do not initialize static and extern variables to 0
PM / Freezer: Make fake_signal_wake_up() wake TASK_KILLABLE tasks too
PM / Hibernate: Add resumedelay kernel param in addition to resumewait
MAINTAINERS: Update linux-pm list address
PM / ACPI: Blacklist Vaio VGN-FW520F machine known to require acpi_sleep=nonvs
PM / ACPI: Blacklist Sony Vaio known to require acpi_sleep=nonvs
PM / Hibernate: Add resumewait param to support MMC-like devices as resume file
PM / Hibernate: Fix typo in a kerneldoc comment
PM / Hibernate: Freeze kernel threads after preallocating memory
PM: Update the policy on default wakeup settings
PM / VT: Cleanup #if defined uglyness and fix compile error
PM / Suspend: Off by one in pm_suspend()
PM / Hibernate: Include storage keys in hibernation image on s390
...
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 04c0dd8d9921..566ab1c23a3d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -2760,7 +2760,7 @@ F: fs/freevxfs/ | |||
2760 | FREEZER | 2760 | FREEZER |
2761 | M: Pavel Machek <pavel@ucw.cz> | 2761 | M: Pavel Machek <pavel@ucw.cz> |
2762 | M: "Rafael J. Wysocki" <rjw@sisk.pl> | 2762 | M: "Rafael J. Wysocki" <rjw@sisk.pl> |
2763 | L: linux-pm@lists.linux-foundation.org | 2763 | L: linux-pm@vger.kernel.org |
2764 | S: Supported | 2764 | S: Supported |
2765 | F: Documentation/power/freezing-of-tasks.txt | 2765 | F: Documentation/power/freezing-of-tasks.txt |
2766 | F: include/linux/freezer.h | 2766 | F: include/linux/freezer.h |
@@ -3022,7 +3022,7 @@ F: drivers/video/hgafb.c | |||
3022 | HIBERNATION (aka Software Suspend, aka swsusp) | 3022 | HIBERNATION (aka Software Suspend, aka swsusp) |
3023 | M: Pavel Machek <pavel@ucw.cz> | 3023 | M: Pavel Machek <pavel@ucw.cz> |
3024 | M: "Rafael J. Wysocki" <rjw@sisk.pl> | 3024 | M: "Rafael J. Wysocki" <rjw@sisk.pl> |
3025 | L: linux-pm@lists.linux-foundation.org | 3025 | L: linux-pm@vger.kernel.org |
3026 | S: Supported | 3026 | S: Supported |
3027 | F: arch/x86/power/ | 3027 | F: arch/x86/power/ |
3028 | F: drivers/base/power/ | 3028 | F: drivers/base/power/ |
@@ -3217,7 +3217,7 @@ F: drivers/ide/ide-cd* | |||
3217 | 3217 | ||
3218 | IDLE-I7300 | 3218 | IDLE-I7300 |
3219 | M: Andy Henroid <andrew.d.henroid@intel.com> | 3219 | M: Andy Henroid <andrew.d.henroid@intel.com> |
3220 | L: linux-pm@lists.linux-foundation.org | 3220 | L: linux-pm@vger.kernel.org |
3221 | S: Supported | 3221 | S: Supported |
3222 | F: drivers/idle/i7300_idle.c | 3222 | F: drivers/idle/i7300_idle.c |
3223 | 3223 | ||
@@ -3300,7 +3300,7 @@ F: firmware/isci/ | |||
3300 | 3300 | ||
3301 | INTEL IDLE DRIVER | 3301 | INTEL IDLE DRIVER |
3302 | M: Len Brown <lenb@kernel.org> | 3302 | M: Len Brown <lenb@kernel.org> |
3303 | L: linux-pm@lists.linux-foundation.org | 3303 | L: linux-pm@vger.kernel.org |
3304 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6.git | 3304 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6.git |
3305 | S: Supported | 3305 | S: Supported |
3306 | F: drivers/idle/intel_idle.c | 3306 | F: drivers/idle/intel_idle.c |
@@ -3397,7 +3397,7 @@ F: drivers/net/ethernet/intel/ | |||
3397 | 3397 | ||
3398 | INTEL MRST PMU DRIVER | 3398 | INTEL MRST PMU DRIVER |
3399 | M: Len Brown <len.brown@intel.com> | 3399 | M: Len Brown <len.brown@intel.com> |
3400 | L: linux-pm@lists.linux-foundation.org | 3400 | L: linux-pm@vger.kernel.org |
3401 | S: Supported | 3401 | S: Supported |
3402 | F: arch/x86/platform/mrst/pmu.* | 3402 | F: arch/x86/platform/mrst/pmu.* |
3403 | 3403 | ||
@@ -6338,7 +6338,7 @@ SUSPEND TO RAM | |||
6338 | M: Len Brown <len.brown@intel.com> | 6338 | M: Len Brown <len.brown@intel.com> |
6339 | M: Pavel Machek <pavel@ucw.cz> | 6339 | M: Pavel Machek <pavel@ucw.cz> |
6340 | M: "Rafael J. Wysocki" <rjw@sisk.pl> | 6340 | M: "Rafael J. Wysocki" <rjw@sisk.pl> |
6341 | L: linux-pm@lists.linux-foundation.org | 6341 | L: linux-pm@vger.kernel.org |
6342 | S: Supported | 6342 | S: Supported |
6343 | F: Documentation/power/ | 6343 | F: Documentation/power/ |
6344 | F: arch/x86/kernel/acpi/ | 6344 | F: arch/x86/kernel/acpi/ |