From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 24 May 2013 15:58:53 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes
X-Git-Tag: v3.10-rc3~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0e255f1c0c9add2f0c920240ac4cadc28ae274c3;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge git://git./linux/kernel/git/steve/gfs2-3.0-fixes

Pull gfs2 fixes from Steven Whitehouse:
 "This time there are just four fixes.  There are a couple of minor
  updates to the quota code, a fix for KConfig to ensure that only valid
  combinations including GFS2 can be built, and a fix for a typo
  affecting end i/o processing when writing the journal.

  Also, there is a temporary fix for a performance regression relating
  to block reservations and directories.  A longer fix will be applied
  in due course, but this deals with the most immediate problem for now"

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes:
  GFS2: Fix typo in gfs2_log_end_write loop
  GFS2: fix DLM depends to fix build errors
  GFS2: Use single-block reservations for directories
  GFS2: two minor quota fixups
---

0e255f1c0c9add2f0c920240ac4cadc28ae274c3