diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-04 16:31:36 +0200 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-04 16:31:36 +0200 |
commit | 31e77ac55f18db0ec1c724840927562ef3093ef6 (patch) | |
tree | 01bb0ac2868debd2246df4c5e5617a2ce9f09600 /MAINTAINERS | |
parent | [GFS2] Tidy up locking code (diff) | |
parent | Linux 2.6.18-rc6 (diff) | |
download | linux-31e77ac55f18db0ec1c724840927562ef3093ef6.tar.xz linux-31e77ac55f18db0ec1c724840927562ef3093ef6.zip |
Merge branch 'master' into gfs2
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 2d036ffd961f..21a451c881be 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 |