Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 18 Dec 2007 16:03:32 +0000 (08:03 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 18 Dec 2007 16:03:32 +0000 (08:03 -0800)
commit57680915a6f2324c008b6213fe12b74507b3fcd0
tree24193356a3de7bb79742d20a00e8ec859c34a8ea
parentd55653377df36f8c04a966f3420335f1a0eb4d83
parent041388b54ed95cd169546bd83bacd08ee32bd7ea
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] Put the correct offset in dirent d_off
  [XFS] Don't wait for pending I/Os when purging blocks beyond eof.