Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Jul 2010 15:23:10 +0000 (08:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Jul 2010 15:23:10 +0000 (08:23 -0700)
commit79140bc486fac016249f3d1d67ec9a39ebed9ad9
treee022f9e593b48018c5ae218f5fcc364e2cacab4c
parentcc10b6ffd39ef982f86de68d95e5811df82cf819
parent728a756b8fcd22d80e2dbba8117a8a3aafd3f203
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: rename causes kernel Oops
  GFS2: BUG in gfs2_adjust_quota
  GFS2: Fix kernel NULL pointer dereference by dlm_astd
  GFS2: recovery stuck on transaction lock
  GFS2: O_TRUNC not working on stuffed files across cluster