Linus Torvalds 5b34653963 Merge branch 'x86/um-header' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip ... * 'x86/um-header' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (26 commits) x86: canonicalize remaining header guards x86: drop double underscores from header guards x86: Fix ASM_X86__ header guards x86, um: get rid of uml-config.h x86, um: get rid of arch/um/Kconfig.arch x86, um: get rid of arch/um/os symlink x86, um: get rid of excessive includes of uml-config.h x86, um: get rid of header symlinks x86, um: merge Kconfig.i386 and Kconfig.x86_64 x86, um: get rid of sysdep symlink x86, um: trim the junk from uml ptrace-*.h x86, um: take vm-flags.h to sysdep x86, um: get rid of uml asm/arch x86, um: get rid of uml highmem.h x86, um: get rid of uml unistd.h x86, um: get rid of system.h -> system.h include x86, um: uml atomic.h is not needed anymore x86, um: untangle uml ldt.h x86, um: get rid of more uml asm/arch uses x86, um: remove dead header (uml module-generic.h; never used these days) ...		2008-10-23 10:22:01 -07: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	kdump: use is_kdump_kernel() in sba_init()	2008-10-20 08:52:40 -07:00
ia32	Merge branch 'x86/um-header' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2008-10-23 10:22:01 -07:00
include/asm	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6	2008-10-23 08:07:35 -07:00
kernel	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6	2008-10-23 08:07:35 -07:00
kvm	KVM: ia64: Add intel iommu support for guests.	2008-10-15 14:25:39 +02:00
lib	[IA64] Add Variable Page Size and IA64 Support in Intel IOMMU	2008-10-17 12:14:13 -07:00
mm	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6	2008-10-23 08:07:35 -07: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] Fix CONFIG_IA64_SGI_UV build error	2008-06-16 09:02:03 -07:00
xen	ia64/pv_ops: update Kconfig for paravirtualized guest and xen.	2008-10-17 10:10:06 -07:00
install.sh	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
Kconfig	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6	2008-10-23 08:07:35 -07:00
Kconfig.debug	[PATCH] Move Kprobes and Oprofile to "Instrumentation Support" menu	2005-11-07 07:53:35 -08:00
Makefile	Pull vtd-iommu into release branch	2008-10-17 13:52:22 -07:00
module.lds	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00