You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		15 years ago
..
configs	sgi-gru: remove SGI_GRU as a valid config option for ia64 configs with SGI_UV	16 years ago
dig	x86, ia64: convert to use generic dma_map_ops struct	16 years ago
hp	[IA64] fix SBA IOMMU to handle allocation failure properly	15 years ago
ia32	elf: kill USE_ELF_CORE_DUMP	15 years ago
include/asm	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6	15 years ago
kernel	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6	15 years ago
kvm	KVM: Activate Virtualization On Demand	15 years ago
lib	[IA64] fix csum_ipv6_magic()	16 years ago
mm	Merge git://git.infradead.org/iommu-2.6	15 years ago
oprofile	[IA64] implement ticket locks for Itanium	16 years ago
pci	vsprintf: use %pR, %pr instead of %pRt, %pRf	15 years ago
scripts	ia64/pv_ops/pvchecker: support mov = ar.itc paravirtualization	16 years ago
sn	ia64: use bitmap_find_next_zero_area	15 years ago
uv	[IA64] Simplify SGI uv vs. sn2 driver issues	16 years ago
xen	percpu: make percpu symbols in xen unique	15 years ago
Kconfig	ia64: convert to dynamic percpu allocator	16 years ago
Kconfig.debug	…
Makefile	arch/ia64/Makefile: Remove -mtune=merced in IA64 kernel build	16 years ago
install.sh	kbuild: use INSTALLKERNEL to select customized installkernel script	16 years ago
module.lds	…