summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-04 06:41:37 -0400
committerJeff Garzik <jeff@garzik.org>2006-09-04 06:41:37 -0400
commitf9bcda7760e1373615c9f6d9ce24209b0ab97de1 (patch)
treef90b3031126c4e4beb8161f38ea436303e2b8b73 /MAINTAINERS
parent9bec2e38527a9f2497b3d976715c672d08d6160d (diff)
parentc336923b668fdcf0312efbec3b44895d713f4d81 (diff)
downloadop-kernel-dev-f9bcda7760e1373615c9f6d9ce24209b0ab97de1.zip
op-kernel-dev-f9bcda7760e1373615c9f6d9ce24209b0ab97de1.tar.gz
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 3bab239..25cd707 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3296,10 +3296,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
OpenPOWER on IntegriCloud