diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 17:41:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 17:41:33 -0400 |
| commit | fdb64f93b38a3470fa4db8cd5720b8c731922d1a (patch) | |
| tree | 3b17370d30a2b580af72b26f37ec7176c9ecdd84 /net | |
| parent | 2d9ce177e68645945e3366cfe2d66ee3c28cd4f2 (diff) | |
| parent | c32676eea19ce29cb74dba0f97b085e83f6b8915 (diff) | |
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>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions