summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Machek <pavel@suse.cz>2009-02-18 14:48:16 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-02-18 15:37:53 -0800
commitef35ce231b3cb2a4b1808e826da263bf37ccb38a (patch)
treecff0928ed72e30941b61203e1ca04ced83efaeb7
parent8f19d472935c83d823fa4cf02bcc0a7b9952db30 (diff)
downloadlinux-stable-ef35ce231b3cb2a4b1808e826da263bf37ccb38a.tar.gz
linux-stable-ef35ce231b3cb2a4b1808e826da263bf37ccb38a.tar.bz2
linux-stable-ef35ce231b3cb2a4b1808e826da263bf37ccb38a.zip
Pavel has moved
My @suse.cz address will stop working some day, so put working one into MAINTAINERS/CREDITS. It would be cool to get this to 2.6.29... it should not really break anything. Signed-off-by: Pavel Machek <pavel@ucw.cz> Cc: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-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()
N: Pavel Machek
E: pavel@ucw.cz
-E: pavel@suse.cz
D: Softcursor for vga, hypertech cdrom support, vcsa bugfix, nbd
D: sun4/330 port, capabilities for elf, speedup for rm on ext2, USB,
D: 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
HIBERNATION (aka Software Suspend, aka swsusp)
P: Pavel Machek
-M: pavel@suse.cz
+M: pavel@ucw.cz
P: Rafael J. Wysocki
M: rjw@sisk.pl
L: linux-pm@lists.linux-foundation.org
@@ -4172,7 +4172,7 @@ SUSPEND TO RAM
P: Len Brown
M: len.brown@intel.com
P: Pavel Machek
-M: pavel@suse.cz
+M: pavel@ucw.cz
P: Rafael J. Wysocki
M: rjw@sisk.pl
L: linux-pm@lists.linux-foundation.org