summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-04 12:29:54 +0200
committerJeff Garzik <jeff@garzik.org>2006-09-04 12:29:54 +0200
commit3784fd7316d336f2ba79b6c7c8168d08eff8a714 (patch)
tree3019c37f1ba588f252d1a9f1ef33beb5d3d683b1 /MAINTAINERS
parentMerge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 ... (diff)
parentLinux 2.6.18-rc6 (diff)
downloadlinux-3784fd7316d336f2ba79b6c7c8168d08eff8a714.tar.xz
linux-3784fd7316d336f2ba79b6c7c8168d08eff8a714.zip
Merge branch 'master' into upstream
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS3
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 3bbd7064f947..6c399b872e3a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3314,10 +3314,11 @@ S: Maintained
XFS FILESYSTEM
P: Silicon Graphics Inc
+P: Tim Shimmin, David Chatterton
M: xfs-masters@oss.sgi.com
-M: nathans@sgi.com
L: xfs@oss.sgi.com
W: http://oss.sgi.com/projects/xfs
+T: git git://oss.sgi.com:8090/xfs/xfs-2.6
S: Supported
X86 3-LEVEL PAGING (PAE) SUPPORT