Merge tag 'for-linus-v3.11-rc3' of git://oss.sgi.com/xfs/xfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 26 Jul 2013 18:22:54 +0000 (11:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 26 Jul 2013 18:22:54 +0000 (11:22 -0700)
commit6c4155a9cd6bd07d3cb70ca5eeb6f2751de0931c
treee2fbc72ab180b3c6b0d0fcee89c29a04f050d0a1
parentf315cf5e02d9910b7be893f5b5afdcc2e49d352d
parente1b4271ac261b290fdab51446996fb13e68a57be
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