From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 24 Aug 2012 04:56:22 +0000 (-0700)
Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
X-Git-Tag: v3.6-rc4~21
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=62688e5b6465395c093b91bd4c29794758eb24fe;p=~andy%2Flinux

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

Pull UDF, ext3 & reiserfs fixes from Jan Kara:
 "A couple of fixes (udf, reiserfs, ext3) that accumulated over my
  vacation."

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  udf: fix retun value on error path in udf_load_logicalvol
  jbd: don't write superblock when unmounting an ro filesystem
  reiserfs: fix deadlocks with quotas
  quota: Move down dqptr_sem read after initializing default warn[] type at __dquot_alloc_space().
  UDF: During mount free lvid_bh before rescanning with different blocksize
  udf: fix udf_setsize() for file data in ICB
---

62688e5b6465395c093b91bd4c29794758eb24fe