From: Linus Torvalds 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: MMI-PSA29.97-13-9~37949 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=57680915a6f2324c008b6213fe12b74507b3fcd0;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.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