Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 30 May 2007 15:19:15 +0000 (08:19 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 30 May 2007 15:19:15 +0000 (08:19 -0700)
* 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6:
  [XFS] Write at EOF may not update filesize correctly.


Trivial merge