From b6815101a49f3b38d36475824e2c6dedd41afd59 Mon Sep 17 00:00:00 2001 From: Pavel Machek Date: Wed, 18 Feb 2009 14:48:16 -0800 Subject: [PATCH] --- yaml --- r: 131486 b: refs/heads/master c: ef35ce231b3cb2a4b1808e826da263bf37ccb38a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/CREDITS | 1 - trunk/MAINTAINERS | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 024b9c899ff3..95a24159f6d2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8f19d472935c83d823fa4cf02bcc0a7b9952db30 +refs/heads/master: ef35ce231b3cb2a4b1808e826da263bf37ccb38a diff --git a/trunk/CREDITS b/trunk/CREDITS index 2b39168c06aa..5e0736722afd 100644 --- a/trunk/CREDITS +++ b/trunk/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/trunk/MAINTAINERS b/trunk/MAINTAINERS index e784b358b335..a2008bd587c2 100644 --- a/trunk/MAINTAINERS +++ b/trunk/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