From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 26 Jul 2013 18:22:54 +0000 (-0700)
Subject: Merge tag 'for-linus-v3.11-rc3' of git://oss.sgi.com/xfs/xfs
X-Git-Tag: v3.11-rc3~14
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=6c4155a9cd6bd07d3cb70ca5eeb6f2751de0931c;p=cascardo%2Flinux.git

Merge tag 'for-linus-v3.11-rc3' of git://oss.sgi.com/xfs/xfs

Pull xfs fix from Ben Myers:
 "Fix for regression in commit cca9f93a52d2 ("xfs: don't do IO when
  creating an new inode"), recovery causing filesystem corruption after
  a crash"

* tag 'for-linus-v3.11-rc3' of git://oss.sgi.com/xfs/xfs:
  xfs: di_flushiter considered harmful
---

6c4155a9cd6bd07d3cb70ca5eeb6f2751de0931c