James Morris 2b82892565 Merge branch 'master' into next ... Conflicts: security/keys/internal.h security/keys/process_keys.c security/keys/request_key.c Fixed conflicts above by using the non 'tsk' versions. Signed-off-by: James Morris <jmorris@namei.org>		2008-11-14 11:29:12 +11:00
..
configs	[IA64] Add Variable Page Size and IA64 Support in Intel IOMMU	2008-10-17 12:14:13 -07:00
dig	[IA64] Add Variable Page Size and IA64 Support in Intel IOMMU	2008-10-17 12:14:13 -07:00
hp	[IA64] use common header for software IO/TLB	2008-11-04 11:31:29 -08:00
ia32	CRED: Wrap current->cred and a few other accessors	2008-11-14 10:39:18 +11:00
include/asm	[IA64] remove dead BIO_VMERGE_BOUNDARY definition	2008-11-04 11:31:58 -08:00
kernel	Merge branch 'master' into next	2008-11-14 11:29:12 +11:00
kvm	KVM: ia64: fix vmm_spin_{un}lock for !CONFIG_SMP	2008-11-11 21:01:30 +02:00
lib	[IA64] Add Variable Page Size and IA64 Support in Intel IOMMU	2008-10-17 12:14:13 -07:00
mm	[IA64] fix the difference between node_mem_map and node_start_pfn	2008-11-04 11:31:12 -08:00
oprofile	oprofile: more whitespace fixes	2008-10-15 20:55:51 +02:00
pci	PCI: Add ability to mmap legacy_io on some platforms	2008-10-20 11:01:46 -07:00
scripts	ia64/pv_ops: paravirtualized instruction checker.	2008-10-17 10:12:54 -07:00
sn	ACPI: fix ia64 build warning	2008-10-23 01:47:29 -04:00
uv	[IA64] Simplify SGI uv vs. sn2 driver issues	2008-11-04 11:29:39 -08:00
xen	ia64/pv_ops: update Kconfig for paravirtualized guest and xen.	2008-10-17 10:10:06 -07:00
install.sh
Kconfig	[IA64] reorder Kconfig options to match x86	2008-11-06 09:24:43 -08:00
Kconfig.debug
Makefile	Pull vtd-iommu into release branch	2008-10-17 13:52:22 -07:00
module.lds