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)
commita289bbe27785a5f47dc501fa2bc18edfec147117
tree848d1625340483d1202c531916ab8de42e01ec0a
parent41e904dee22066ae7ac3a7f695b2c8bd43ce4e04
parente99f056b2777f3fc6871ff6347c98c0321ad2f8f
Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

* '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.