Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
Linus Torvalds [Tue, 25 May 2010 15:17:51 +0000 (08:17 -0700)]
* 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

1  2 
fs/gfs2/acl.c
fs/gfs2/rgrp.c

diff --cc fs/gfs2/acl.c
Simple merge
diff --cc fs/gfs2/rgrp.c
Simple merge