summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-11-19 06:05:17 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-19 06:05:17 -0500
commitab5c5f639bba89d1103deae447836edf41e37659 (patch)
treef7e619c425975e0a022ba2ff2449bf2ce8b6cca4 /MAINTAINERS
parentc5e0c7825d3a14c2dfc383763393f0bcb5400aa6 (diff)
parentc8891329131f791e0ddc422eaf6fc86e9a8cf8f5 (diff)
downloadlinux-ab5c5f639bba89d1103deae447836edf41e37659.tar.bz2
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs: MAINTAINERS: update XFS maintainer entry xfs: use doalloc flag in xfs_qm_dqattach_one()
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS3
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 78751bbfa91a..48fe11cc2306 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7436,7 +7436,8 @@ F: drivers/xen/*swiotlb*
XFS FILESYSTEM
P: Silicon Graphics Inc
-M: Alex Elder <aelder@sgi.com>
+M: Ben Myers <bpm@sgi.com>
+M: Alex Elder <elder@kernel.org>
M: xfs-masters@oss.sgi.com
L: xfs@oss.sgi.com
W: http://oss.sgi.com/projects/xfs