From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 18 Dec 2007 16:03:32 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6
X-Git-Tag: v2.6.24-rc6~20
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=57680915a6f2324c008b6213fe12b74507b3fcd0;p=linux-2.6-omap-h63xx.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] Put the correct offset in dirent d_off
  [XFS] Don't wait for pending I/Os when purging blocks beyond eof.
---

57680915a6f2324c008b6213fe12b74507b3fcd0