From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 11 Oct 2014 12:02:31 +0000 (-0400)
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=ac0c49396d5ed9a33f08ce661635ac1bff80bb4f;p=openwrt%2Fstaging%2Fblogic.git

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

Pull UDF and quota updates from Jan Kara:
 "A few UDF fixes and also a few patches which are preparing filesystems
  for support of project quotas in VFS"

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  udf: Fix loading of special inodes
  ocfs2: Back out change to use OCFS2_MAXQUOTAS in ocfs2_setattr()
  udf: remove redundant sys_tz declaration
  ocfs2: Don't use MAXQUOTAS value
  reiserfs: Don't use MAXQUOTAS value
  ext3: Don't use MAXQUOTAS value
  udf: Fix race between write(2) and close(2)
---

ac0c49396d5ed9a33f08ce661635ac1bff80bb4f