diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-04 06:42:01 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-04 06:42:01 -0400 |
| commit | fc851fad00d7fa1bf4ac7034d9ba8041bf482d50 (patch) | |
| tree | 779a8b572d1701ef2c46755df751d9275650cdf4 /MAINTAINERS | |
| parent | 85cd7251b9112e3dabeac9fd3b175601ca607241 (diff) | |
| parent | f9bcda7760e1373615c9f6d9ce24209b0ab97de1 (diff) | |
Merge branch 'upstream' into pata-drivers
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 3bab239e82fe..25cd7073a20b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -3296,10 +3296,11 @@ S: Maintained | |||
| 3296 | 3296 | ||
| 3297 | XFS FILESYSTEM | 3297 | XFS FILESYSTEM |
| 3298 | P: Silicon Graphics Inc | 3298 | P: Silicon Graphics Inc |
| 3299 | P: Tim Shimmin, David Chatterton | ||
| 3299 | M: xfs-masters@oss.sgi.com | 3300 | M: xfs-masters@oss.sgi.com |
| 3300 | M: nathans@sgi.com | ||
| 3301 | L: xfs@oss.sgi.com | 3301 | L: xfs@oss.sgi.com |
| 3302 | W: http://oss.sgi.com/projects/xfs | 3302 | W: http://oss.sgi.com/projects/xfs |
| 3303 | T: git git://oss.sgi.com:8090/xfs/xfs-2.6 | ||
| 3303 | S: Supported | 3304 | S: Supported |
| 3304 | 3305 | ||
| 3305 | X86 3-LEVEL PAGING (PAE) SUPPORT | 3306 | X86 3-LEVEL PAGING (PAE) SUPPORT |