diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-04 06:29:54 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-04 06:29:54 -0400 |
| commit | 3784fd7316d336f2ba79b6c7c8168d08eff8a714 (patch) | |
| tree | 3019c37f1ba588f252d1a9f1ef33beb5d3d683b1 /MAINTAINERS | |
| parent | 7c440e7990ea22c0c374c59a5fbd79b0579d1517 (diff) | |
| parent | c336923b668fdcf0312efbec3b44895d713f4d81 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 3bbd7064f947..6c399b872e3a 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 |