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
..
boot	x86: Fix ASM_X86__ header guards	2008-10-22 22:55:23 -07:00
configs	x86: remove irqbalance in kernel for 32 bit	2008-10-16 16:52:52 +02:00
crypto	crypto: crc32c - Use Intel CRC32 instruction	2008-08-29 15:49:50 +10:00
ia32	compat: generic compat get/settimeofday	2008-10-16 11:21:33 -07:00
include/asm	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
kernel	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
kvm	Merge branch 'kvm-updates/2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm	2008-10-16 15:36:00 -07:00
lguest	x86: make 32bit support per_cpu vector	2008-10-16 16:52:53 +02:00
lib	Merge branch 'x86/unify-cpu-detect' into x86-v28-for-linus-phase4-D	2008-10-11 20:23:20 +02:00
mach-default	Merge branches 'x86/prototypes', 'x86/x2apic' and 'x86/debug' into x86/core	2008-08-14 14:58:22 +02:00
mach-generic	x86: make 32bit support per_cpu vector	2008-10-16 16:52:53 +02:00
mach-rdc321x	removed unused #include <linux/version.h>'s	2008-08-23 12:14:12 -07:00
mach-voyager	generic: sparse irqs: use irq_desc() together with dyn_array, instead of irq_desc[]	2008-10-16 16:52:29 +02:00
math-emu
mm	Merge branch 'tracing-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2008-10-20 13:35:07 -07:00
oprofile	oprofile: fixing whitespaces in arch/x86/oprofile/*	2008-10-16 17:17:46 +02:00
pci	x86/PCI: irq and pci_ids patch for Intel Ibex Peak DeviceIDs	2008-10-20 10:53:48 -07:00
power	Merge branch 'x86/unify-cpu-detect' into x86-v28-for-linus-phase4-D	2008-10-11 20:23:20 +02:00
vdso	Merge branches 'x86/urgent', 'x86/amd-iommu', 'x86/apic', 'x86/cleanups', 'x86/core', 'x86/cpu', 'x86/fixmap', 'x86/gart', 'x86/kprobes', 'x86/memtest', 'x86/modules', 'x86/nmi', 'x86/pat', 'x86/reboot', 'x86/setup', 'x86/step', 'x86/unify-pci', 'x86/uv', 'x86/xen' and 'xen-64bit' into x86/for-linus	2008-07-21 16:37:17 +02:00
video
xen	Merge branch 'genirq-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2008-10-20 13:23:01 -07:00
Kconfig	Merge branch 'linus' into test	2008-10-23 00:11:07 -04:00
Kconfig.cpu	x86: adjust dependencies for CONFIG_X86_CMOV	2008-10-13 10:33:50 +02:00
Kconfig.debug	x86: usb debug port early console, fix	2008-07-26 17:32:30 +02:00
Makefile	x86, um: ... and asm-x86 move	2008-10-22 22:55:20 -07:00
Makefile_32.cpu	x86: merge winchip-2 and winchip-2a cpu choices	2008-10-13 10:22:48 +02:00