diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-25 08:17:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-25 08:17:51 -0700 |
| commit | f16a5e347835c6a0ba958535cf6e6c89d50463b8 (patch) | |
| tree | 41d2e7784f57212a3f910690e00dcd1707a7e47f /fs/nilfs2/cpfile.h | |
| parent | 110b93842e36b17598cf24874e90d0401431cda2 (diff) | |
| parent | 7df0e0397b9a18358573274db9fdab991941062f (diff) | |
Merge git://git.kernel.org/pub/scm/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
Diffstat (limited to 'fs/nilfs2/cpfile.h')
0 files changed, 0 insertions, 0 deletions