James Morris 5a2f3a02ae Merge branch 'next-evm' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/ima-2.6 into next ...

Conflicts:
	fs/attr.c

Resolve conflict manually.

Signed-off-by: James Morris <jmorris@namei.org>

2011-08-09 10:31:03 +10:00

..

acl.c

switch posix_acl_equiv_mode() to umode_t *

2011-08-01 02:10:06 -04:00

acl.h

ext2: remove duplicate 'ext2_get_acl()' define

2011-07-29 23:21:50 -07:00

balloc.c

…

dir.c

…

ext2.h

fs: push i_mutex and filemap_write_and_wait down into ->fsync() handlers

2011-07-20 20:47:59 -04:00

file.c

fs: take the ACL checks to common code

2011-07-25 14:30:23 -04:00

ialloc.c

…

inode.c

fs: simplify the blockdev_direct_IO prototype

2011-07-20 20:47:49 -04:00

ioctl.c

…

Kconfig

…

Makefile

…

namei.c

fs: take the ACL checks to common code

2011-07-25 14:30:23 -04:00

super.c

…

symlink.c

…

xattr_security.c

…

xattr_trusted.c

…

xattr_user.c

…

xattr.c

ext2: check xattr name_len before acquiring xattr_sem in ext2_xattr_get

2011-07-22 19:41:16 +02:00

xattr.h

…

xip.c

…

xip.h

…