From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Jan 2012 18:33:39 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw
X-Git-Tag: v3.3-rc1~77
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=57e6a7dde8cfca9ac1d6702cf9104d22bc11ba90;p=~emulex%2Finfiniband.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw:
  GFS2: Fix nlink setting on inode creation
  GFS2: fail mount if journal recovery fails
  GFS2: let spectator mount do read only recovery
  GFS2: Fix a use-after-free that coverity spotted
  GFS2: dlm based recovery coordination
---

57e6a7dde8cfca9ac1d6702cf9104d22bc11ba90