Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Aug 2009 16:34:25 +0000 (09:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Aug 2009 16:34:25 +0000 (09:34 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
  GFS2: Fix permissions on "recover" file


Trivial merge