From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 19 Jun 2007 15:06:25 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6
X-Git-Tag: v5.15~48350
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=a289bbe27785a5f47dc501fa2bc18edfec147117;p=mirror_ubuntu-kernels.git

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

a289bbe27785a5f47dc501fa2bc18edfec147117