summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorAlex Elder <aelder@sgi.com>2009-09-15 21:37:47 -0500
committerAlex Elder <aelder@sgi.com>2009-09-15 21:37:47 -0500
commitfdec29c5fcd2705d61c1d14a1d4c74be03e9627c (patch)
treebcf5d4dd46b4945f3b4bec6b763ff9a9484e4e59 /MAINTAINERS
parent0cb583fd2862f19ea88b02eb307d11c09e51e2f8 (diff)
parent9ef96da6ec5e1b4cf7eb8e30852cd88ec7d5fdc0 (diff)
downloadlinux-fdec29c5fcd2705d61c1d14a1d4c74be03e9627c.tar.gz
linux-fdec29c5fcd2705d61c1d14a1d4c74be03e9627c.tar.bz2
linux-fdec29c5fcd2705d61c1d14a1d4c74be03e9627c.zip
Merge branch 'master' of git://oss.sgi.com/xfs/xfs into for-linus
Conflicts: fs/xfs/linux-2.6/xfs_lrw.c
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 64b9e447545c..9c3fdce4a241 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5694,7 +5694,7 @@ F: include/xen/
XFS FILESYSTEM
P: Silicon Graphics Inc
-M: Felix Blyakher <felixb@sgi.com>
+M: Alex Elder <aelder@sgi.com>
M: xfs-masters@oss.sgi.com
L: xfs@oss.sgi.com
W: http://oss.sgi.com/projects/xfs