tree 16c4ee5593847cc96e44e95f94e3ca0e315dfb1d
parent 7046e668d7973c470146fbe6635967a1b4a31bca
parent 0809f6ec18bbce54c996f5c36f4b9d371075c98b
author Linus Torvalds <torvalds@linux-foundation.org> 1280871610 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1280871610 -0700

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

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw:
  GFS2: Fix recovery stuck bug (try #2)
  GFS2: Fix typo in stuffed file data copy handling
  Revert "GFS2: recovery stuck on transaction lock"
  GFS2: Make "try" lock not try quite so hard
  GFS2: remove dependency on __GFP_NOFAIL
  GFS2: Simplify gfs2_write_alloc_required
  GFS2: Wait for journal id on mount if not specified on mount command line
  GFS2: Use nobh_writepage