Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 19 Jun 2007 15:06:25 +0000 (08:06 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 19 Jun 2007 15:06:25 +0000 (08:06 -0700)
* 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6:
  [XFS] Update the MAINTAINERS file entry for XFS - change git repo name.
  [XFS] s/memclear_highpage_flush/zero_user_page/
  [XFS] Update the MAINTAINERS file entry for XFS.


Trivial merge