From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 19 Jul 2007 21:41:33 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6
X-Git-Tag: v2.6.23-rc1~252
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fdb64f93b38a3470fa4db8cd5720b8c731922d1a;p=pandora-kernel.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] Fix inode size update before data write in xfs_setattr
  [XFS] Allow punching holes to free space when at ENOSPC
  [XFS] Implement ->page_mkwrite in XFS.
  [FS] Implement block_page_mkwrite.

Manually fix up conflict with Nick's VM fault handling patches in
fs/xfs/linux-2.6/xfs_file.c

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

fdb64f93b38a3470fa4db8cd5720b8c731922d1a
Reading git-diff-tree failed