From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 3 Aug 2010 21:40:10 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
X-Git-Tag: v3.12-rc1~9511
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3a09b1be53d23df780a0cd0e4087a05e2ca4a00c;p=kernel%2Fkernel-generic.git

Merge git://git./linux/kernel/git/steve/gfs2-2.6-nmw

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw:
  GFS2: Fix recovery stuck bug (try #2)
  GFS2: Fix typo in stuffed file data copy handling
  Revert "GFS2: recovery stuck on transaction lock"
  GFS2: Make "try" lock not try quite so hard
  GFS2: remove dependency on __GFP_NOFAIL
  GFS2: Simplify gfs2_write_alloc_required
  GFS2: Wait for journal id on mount if not specified on mount command line
  GFS2: Use nobh_writepage
---

3a09b1be53d23df780a0cd0e4087a05e2ca4a00c