diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-09-11 14:08:41 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-09-11 14:08:41 -0400 |
| commit | 623b3e1d645e42030897d18d37db10133d763006 (patch) | |
| tree | 090ff481cd72b47ff87d50615461712a33ba41e6 /MAINTAINERS | |
| parent | c576af479162c0a11d4e2691ebc97354958d9285 (diff) | |
| parent | 38f5745c5a90641079fd5b48600ae63f7ab6edcd (diff) | |
Merge branch 'from-linus' 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 3356124fbba5..c04c25ea3141 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -3308,10 +3308,11 @@ S: Maintained | |||
| 3308 | 3308 | ||
| 3309 | XFS FILESYSTEM | 3309 | XFS FILESYSTEM |
| 3310 | P: Silicon Graphics Inc | 3310 | P: Silicon Graphics Inc |
| 3311 | P: Tim Shimmin, David Chatterton | ||
| 3311 | M: xfs-masters@oss.sgi.com | 3312 | M: xfs-masters@oss.sgi.com |
| 3312 | M: nathans@sgi.com | ||
| 3313 | L: xfs@oss.sgi.com | 3313 | L: xfs@oss.sgi.com |
| 3314 | W: http://oss.sgi.com/projects/xfs | 3314 | W: http://oss.sgi.com/projects/xfs |
| 3315 | T: git git://oss.sgi.com:8090/xfs/xfs-2.6 | ||
| 3315 | S: Supported | 3316 | S: Supported |
| 3316 | 3317 | ||
| 3317 | X86 3-LEVEL PAGING (PAE) SUPPORT | 3318 | X86 3-LEVEL PAGING (PAE) SUPPORT |