From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 2 Sep 2011 15:25:23 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
X-Git-Tag: v3.1-rc5~2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4d7b5a116f9c08719d98f81e21c7d47f672bdb69;p=users%2Fhch%2Fmisc.git

Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: fix ->write_inode return values
  xfs: fix xfs_mark_inode_dirty during umount
  xfs: deprecate the nodelaylog mount option
---

4d7b5a116f9c08719d98f81e21c7d47f672bdb69