diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-04 10:31:36 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-04 10:31:36 -0400 |
| commit | 31e77ac55f18db0ec1c724840927562ef3093ef6 (patch) | |
| tree | 01bb0ac2868debd2246df4c5e5617a2ce9f09600 /MAINTAINERS | |
| parent | 5029996547a9f3988459e11955c13259495308ef (diff) | |
| parent | c336923b668fdcf0312efbec3b44895d713f4d81 (diff) | |
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 | |||
| 3314 | 3314 | ||
| 3315 | XFS FILESYSTEM | 3315 | XFS FILESYSTEM |
| 3316 | P: Silicon Graphics Inc | 3316 | P: Silicon Graphics Inc |
| 3317 | P: Tim Shimmin, David Chatterton | ||
| 3317 | M: xfs-masters@oss.sgi.com | 3318 | M: xfs-masters@oss.sgi.com |
| 3318 | M: nathans@sgi.com | ||
| 3319 | L: xfs@oss.sgi.com | 3319 | L: xfs@oss.sgi.com |
| 3320 | W: http://oss.sgi.com/projects/xfs | 3320 | W: http://oss.sgi.com/projects/xfs |
| 3321 | T: git git://oss.sgi.com:8090/xfs/xfs-2.6 | ||
| 3321 | S: Supported | 3322 | S: Supported |
| 3322 | 3323 | ||
| 3323 | X86 3-LEVEL PAGING (PAE) SUPPORT | 3324 | X86 3-LEVEL PAGING (PAE) SUPPORT |