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
..
configs
hpux	sanitize do_pipe_flags() callers in arch	2009-12-16 12:16:40 -05:00
include/asm	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6	2009-12-16 10:12:07 -08:00
kernel	Merge branch 'for-2.6.33' of git://linux-nfs.org/~bfields/linux	2009-12-16 10:43:34 -08:00
lib	locking: Rename __RAW_SPIN_LOCK_UNLOCKED to __ARCH_SPIN_LOCK_UNLOCKED	2009-12-14 23:55:32 +01:00
math-emu
mm	parisc: rename parisc's vmalloc_start to parisc_vmalloc_start	2009-09-27 23:27:04 -04:00
oprofile
defpalo.conf
install.sh	kbuild: use INSTALLKERNEL to select customized installkernel script	2009-09-20 12:18:14 +02:00
Kconfig	parisc: HAVE_ARCH_TRACEHOOK	2009-09-27 23:07:23 -04:00
Kconfig.debug
Makefile	kbuild: use INSTALLKERNEL to select customized installkernel script	2009-09-20 12:18:14 +02:00
nm