diff --git a/[refs] b/[refs] index afab763e5e24..4a2cbdd08c90 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dc709bd190c130b299ac19d596594256265c042a +refs/heads/master: 1ad8f401b6e16e3ba8a70dcda466e7a0986f7e5e diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 3bab239e82fe..25cd7073a20b 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -3296,10 +3296,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