aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Shimmin <tes@chook.melbourne.sgi.com>2007-06-19 01:06:15 -0400
committerTim Shimmin <tes@chook.melbourne.sgi.com>2007-06-19 01:06:15 -0400
commit6a91d25c0243bf20356e51cc5dbb821cc8cc129b (patch)
treee6bbd7611a7ff625086a9db7cca44a9c63d8ce24
parentfa490cfd15d7ce0900097cc4e60cfd7a76381138 (diff)
parent78bfd36169398bfc07bca218952a429bf301bc55 (diff)
Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6 into for-linus
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index bef79776b388..303ef7de4cf4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4022,7 +4022,7 @@ S: Supported
4022 4022
4023XFS FILESYSTEM 4023XFS FILESYSTEM
4024P: Silicon Graphics Inc 4024P: Silicon Graphics Inc
4025P: Tim Shimmin, David Chatterton 4025P: Tim Shimmin
4026M: xfs-masters@oss.sgi.com 4026M: xfs-masters@oss.sgi.com
4027L: xfs@oss.sgi.com 4027L: xfs@oss.sgi.com
4028W: http://oss.sgi.com/projects/xfs 4028W: http://oss.sgi.com/projects/xfs