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	sgi-gru: remove SGI_GRU as a valid config option for ia64 configs with SGI_UV	2009-04-02 19:05:07 -07:00
dig	x86, ia64: convert to use generic dma_map_ops struct	2009-01-06 14:06:57 +01:00
hp	[IA64] fix SBA IOMMU to handle allocation failure properly	2009-12-14 16:38:43 -08:00
ia32	elf: kill USE_ELF_CORE_DUMP	2009-12-16 07:20:12 -08:00
include/asm	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6	2009-12-16 10:44:43 -08:00
kernel	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6	2009-12-16 12:04:02 -08:00
kvm	KVM: Activate Virtualization On Demand	2009-12-03 09:32:10 +02:00
lib	[IA64] fix csum_ipv6_magic()	2009-09-02 09:14:48 -07:00
mm	Merge git://git.infradead.org/iommu-2.6	2009-12-16 10:11:38 -08:00
oprofile	[IA64] implement ticket locks for Itanium	2009-09-25 08:42:16 -07:00
pci	vsprintf: use %pR, %pr instead of %pRt, %pRf	2009-11-04 13:06:41 -08:00
scripts	ia64/pv_ops/pvchecker: support mov = ar.itc paravirtualization	2009-03-26 10:50:09 -07:00
sn	ia64: use bitmap_find_next_zero_area	2009-12-16 07:20:21 -08:00
uv	[IA64] Simplify SGI uv vs. sn2 driver issues	2008-11-04 11:29:39 -08:00
xen	percpu: make percpu symbols in xen unique	2009-10-29 22:34:13 +09:00
install.sh	kbuild: use INSTALLKERNEL to select customized installkernel script	2009-09-20 12:18:14 +02:00
Kconfig	ia64: convert to dynamic percpu allocator	2009-10-02 13:28:56 +09:00
Kconfig.debug
Makefile	arch/ia64/Makefile: Remove -mtune=merced in IA64 kernel build	2009-08-11 14:52:11 -07:00
module.lds