From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 14 Aug 2009 16:34:25 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
X-Git-Tag: v2.6.31-rc7~39
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5d12dc1fd6b0ba31d3166e42ed01996df6dad34e;p=~emulex%2Finfiniband.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
  GFS2: Fix permissions on "recover" file
---

5d12dc1fd6b0ba31d3166e42ed01996df6dad34e