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)
commit5d12dc1fd6b0ba31d3166e42ed01996df6dad34e
tree5a141bf7290835ecc5511d23c548fcfb70b97f94
parent3011c7f0d421ed85c75683addf3b31eaa1ab6cec
parentd7e623da1a757fbd8c117fa29190ca8bef14dab3
Merge git://git./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