From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 25 May 2010 15:17:51 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=f16a5e347835c6a0ba958535cf6e6c89d50463b8;p=openwrt%2Fstaging%2Fblogic.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: Fix permissions checking for setflags ioctl()
  GFS2: Don't "get" xattrs for ACLs when ACLs are turned off
  GFS2: Rework reclaiming unlinked dinodes
---

f16a5e347835c6a0ba958535cf6e6c89d50463b8