From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 13 Sep 2006 00:31:16 +0000 (-0700)
Subject: Merge git://oss.sgi.com:8090/xfs/xfs-2.6
X-Git-Tag: v2.6.18-rc7~6
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=af84b99f22df115e7aec41d5dbe936e163ef4e2e;p=linux-2.6-omap-h63xx.git

Merge git://oss.sgi.com:8090/xfs/xfs-2.6

* git://oss.sgi.com:8090/xfs/xfs-2.6:
  [XFS] Fix a bad pointer dereference in the quota statvfs handling.
  [XFS] Fix xfs_splice_write() so appended data gets to disk.
  [XFS] Fix ABBA deadlock between i_mutex and iolock. Avoid calling
  [XFS] Prevent free space oversubscription and xfssyncd looping.
---

af84b99f22df115e7aec41d5dbe936e163ef4e2e