From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 16 Jul 2010 15:23:10 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
X-Git-Tag: v3.0~4254
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=79140bc486fac016249f3d1d67ec9a39ebed9ad9;p=platform%2Fkernel%2Flinux-amlogic.git

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
---

79140bc486fac016249f3d1d67ec9a39ebed9ad9