diff options
| author | Alex Elder <aelder@sgi.com> | 2009-09-15 22:37:47 -0400 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2009-09-15 22:37:47 -0400 |
| commit | fdec29c5fcd2705d61c1d14a1d4c74be03e9627c (patch) | |
| tree | bcf5d4dd46b4945f3b4bec6b763ff9a9484e4e59 /MAINTAINERS | |
| parent | 0cb583fd2862f19ea88b02eb307d11c09e51e2f8 (diff) | |
| parent | 9ef96da6ec5e1b4cf7eb8e30852cd88ec7d5fdc0 (diff) | |
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-- | MAINTAINERS | 2 |
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/ | |||
| 5694 | 5694 | ||
| 5695 | XFS FILESYSTEM | 5695 | XFS FILESYSTEM |
| 5696 | P: Silicon Graphics Inc | 5696 | P: Silicon Graphics Inc |
| 5697 | M: Felix Blyakher <felixb@sgi.com> | 5697 | M: Alex Elder <aelder@sgi.com> |
| 5698 | M: xfs-masters@oss.sgi.com | 5698 | M: xfs-masters@oss.sgi.com |
| 5699 | L: xfs@oss.sgi.com | 5699 | L: xfs@oss.sgi.com |
| 5700 | W: http://oss.sgi.com/projects/xfs | 5700 | W: http://oss.sgi.com/projects/xfs |