From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 2 Feb 2010 20:48:26 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
X-Git-Tag: v3.0~6104
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4dab75ec3ebf28583fc902ac946b287b5acdbcad;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: Use GFP_NOFS for alloc structure
  GFS2: Fix previous patch
  GFS2: Don't withdraw on partial rindex entries
  GFS2: Fix refcnt leak on gfs2_follow_link() error path
---

4dab75ec3ebf28583fc902ac946b287b5acdbcad