From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 21 Nov 2012 04:48:25 +0000 (-1000)
Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ca6215dfc7d09809b97f2d6af0535d7836cbb966;p=openwrt%2Fstaging%2Fblogic.git

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

Pull reiserfs and ext3 fixes from Jan Kara:
 "Fixes of reiserfs deadlocks when quotas are enabled (locking there was
  completely busted by BKL conversion) and also one small ext3 fix in
  the trim interface."

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  ext3: Avoid underflow of in ext3_trim_fs()
  reiserfs: Move quota calls out of write lock
  reiserfs: Protect reiserfs_quota_write() with write lock
  reiserfs: Protect reiserfs_quota_on() with write lock
  reiserfs: Fix lock ordering during remount
---

ca6215dfc7d09809b97f2d6af0535d7836cbb966