aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CREDITS1
-rw-r--r--MAINTAINERS4
2 files changed, 2 insertions, 3 deletions
diff --git a/CREDITS b/CREDITS
index 2b39168c06aa..5e0736722afd 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2166,7 +2166,6 @@ D: Initial implementation of VC's, pty's and select()
2166 2166
2167N: Pavel Machek 2167N: Pavel Machek
2168E: pavel@ucw.cz 2168E: pavel@ucw.cz
2169E: pavel@suse.cz
2170D: Softcursor for vga, hypertech cdrom support, vcsa bugfix, nbd 2169D: Softcursor for vga, hypertech cdrom support, vcsa bugfix, nbd
2171D: sun4/330 port, capabilities for elf, speedup for rm on ext2, USB, 2170D: sun4/330 port, capabilities for elf, speedup for rm on ext2, USB,
2172D: work on suspend-to-ram/disk, killing duplicates from ioctl32 2171D: work on suspend-to-ram/disk, killing duplicates from ioctl32
diff --git a/MAINTAINERS b/MAINTAINERS
index e784b358b335..a2008bd587c2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2001,7 +2001,7 @@ S: Maintained
2001 2001
2002HIBERNATION (aka Software Suspend, aka swsusp) 2002HIBERNATION (aka Software Suspend, aka swsusp)
2003P: Pavel Machek 2003P: Pavel Machek
2004M: pavel@suse.cz 2004M: pavel@ucw.cz
2005P: Rafael J. Wysocki 2005P: Rafael J. Wysocki
2006M: rjw@sisk.pl 2006M: rjw@sisk.pl
2007L: linux-pm@lists.linux-foundation.org 2007L: linux-pm@lists.linux-foundation.org
@@ -4172,7 +4172,7 @@ SUSPEND TO RAM
4172P: Len Brown 4172P: Len Brown
4173M: len.brown@intel.com 4173M: len.brown@intel.com
4174P: Pavel Machek 4174P: Pavel Machek
4175M: pavel@suse.cz 4175M: pavel@ucw.cz
4176P: Rafael J. Wysocki 4176P: Rafael J. Wysocki
4177M: rjw@sisk.pl 4177M: rjw@sisk.pl
4178L: linux-pm@lists.linux-foundation.org 4178L: linux-pm@lists.linux-foundation.org