projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7046e66 0809f6e)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 3 Aug 2010 21:40:10 +0000 (14:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 3 Aug 2010 21:40:10 +0000 (14:40 -0700)
commit3a09b1be53d23df780a0cd0e4087a05e2ca4a00c
tree16c4ee5593847cc96e44e95f94e3ca0e315dfb1dtree | snapshot
parent7046e668d7973c470146fbe6635967a1b4a31bcacommit | diff
parent0809f6ec18bbce54c996f5c36f4b9d371075c98bcommit | diff
Merge git://git./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
ep93xx device tree rework repo: git://git.maquefel.me/linux.git