projects / linux-drm-fsl-dcu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 110b938 7df0e03)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 May 2010 15:17:51 +0000 (08:17 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
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 patch | diff1 | diff2 | blob | history
fs/gfs2/rgrp.c patch | diff1 | diff2 | blob | history

diff --cc fs/gfs2/acl.c
Simple merge
diff --cc fs/gfs2/rgrp.c
Simple merge
Freescale DCU DRM driver