Linus Torvalds bac5e54c29 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 ... * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (38 commits) direct I/O fallback sync simplification ocfs: stop using do_sync_mapping_range cleanup blockdev_direct_IO locking make generic_acl slightly more generic sanitize xattr handler prototypes libfs: move EXPORT_SYMBOL for d_alloc_name vfs: force reval of target when following LAST_BIND symlinks (try #7) ima: limit imbalance msg Untangling ima mess, part 3: kill dead code in ima Untangling ima mess, part 2: deal with counters Untangling ima mess, part 1: alloc_file() O_TRUNC open shouldn't fail after file truncation ima: call ima_inode_free ima_inode_free IMA: clean up the IMA counts updating code ima: only insert at inode creation time ima: valid return code from ima_inode_alloc fs: move get_empty_filp() deffinition to internal.h Sanitize exec_permission_lite() Kill cached_lookup() and real_lookup() Kill path_lookup_open() ... Trivial conflicts in fs/direct-io.c		2009-12-16 12:04:02 -08:00
..
acl.c	sanitize xattr handler prototypes	2009-12-16 12:16:49 -05:00
acl.h	ext[234]: move over to 'check_acl' permission model	2009-09-08 11:09:04 -07:00
balloc.c
dir.c	ext2: report metadata errors during fsync	2009-12-16 07:20:06 -08:00
ext2.h	ext2: report metadata errors during fsync	2009-12-16 07:20:06 -08:00
file.c	ext2: report metadata errors during fsync	2009-12-16 07:20:06 -08:00
ialloc.c
inode.c	ext2: Unify log messages in ext2	2009-12-10 15:02:52 +01:00
ioctl.c	headers: smp_lock.h redux	2009-07-12 12:22:34 -07:00
Kconfig
Makefile	switch ext2 to simple_fsync()	2009-06-11 21:36:12 -04:00
namei.c	ext2: fix format string compile warning (ino_t)	2009-09-23 07:39:58 -07:00
super.c	ext2: avoid WARN() messages when failing to write to the superblock	2009-12-16 07:20:05 -08:00
symlink.c
xattr_security.c	sanitize xattr handler prototypes	2009-12-16 12:16:49 -05:00
xattr_trusted.c	sanitize xattr handler prototypes	2009-12-16 12:16:49 -05:00
xattr_user.c	sanitize xattr handler prototypes	2009-12-16 12:16:49 -05:00
xattr.c	sanitize xattr handler prototypes	2009-12-16 12:16:49 -05:00
xattr.h
xip.c	ext2: Unify log messages in ext2	2009-12-10 15:02:52 +01:00
xip.h