tree 5a141bf7290835ecc5511d23c548fcfb70b97f94
parent 3011c7f0d421ed85c75683addf3b31eaa1ab6cec
parent d7e623da1a757fbd8c117fa29190ca8bef14dab3
author Linus Torvalds <torvalds@linux-foundation.org> 1250267665 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1250267665 -0700

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