summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-08-08 12:37:17 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-08-08 12:37:17 +0000
commit9aa9eb41942b918f385ccabd2efdd6e7e4232165 (patch)
tree20bec7da036d31ec185dfc1dcc00753c7ac9b170 /MAINTAINERS
parent87075e049581f880f01eb0b41aa6ac807b299e35 (diff)
Merge with Linux 2.4.0-test6-pre1.
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS4
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index a43577ded..f521bc0d5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -393,8 +393,8 @@ L: linux-kernel@vger.rutgers.edu
S: Maintained
FILE LOCKING (flock() and fcntl()/lockf())
-P: Andy Walker
-M: andy@lysaker.kvaerner.no
+P: Matthew Wilcox
+M: willy@thepuffingroup.com
L: linux-kernel@vger.rutgers.edu
S: Maintained