1
linux/arch/x86
Ingo Molnar 51ca3c6791 Merge branch 'linus' into x86/core
Conflicts:
	arch/x86/kernel/genapic_64.c
	include/asm-x86/kvm_host.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2008-08-14 14:58:01 +02:00
..
boot Merge branch 'linus' into x86/header-guards 2008-07-26 15:30:40 +02:00
configs Subject: devmem, x86: fix rename of CONFIG_NONPROMISC_DEVMEM 2008-07-20 08:35:55 +02:00
crypto [CRYPTO] aes-x86-32: Remove unused return code 2008-04-21 10:19:21 +08:00
es7000 x86: mach_es7000 to es7000 2008-07-26 16:31:34 +02:00
ia32 tracehook: exec 2008-07-26 12:00:08 -07:00
kernel Merge branch 'linus' into x86/core 2008-08-14 14:58:01 +02:00
kvm KVM: Advertise synchronized mmu support to userspace 2008-07-29 12:34:02 +03:00
lguest Merge commit 'v2.6.27-rc1' into x86/core 2008-07-30 19:33:48 +02:00
lib x86: wrong register was used in align macro 2008-07-30 10:10:39 -07:00
mach-default x86: apic interrupts - move assignments to irqinit_32.c, v2 2008-08-11 16:43:09 +02:00
mach-generic x86: mach-numaq to numaq 2008-07-26 16:31:35 +02:00
mach-rdc321x
mach-voyager Merge branch 'generic-ipi' into generic-ipi-for-linus 2008-07-15 21:55:59 +02:00
math-emu x86: coding style fixes to arch/x86/math-emu/reg_constant 2008-06-18 15:00:13 +02:00
mm Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus 2008-08-12 08:40:19 -07:00
oprofile x86/oprofile/nmi_int: add Nehalem to list of ppro cores 2008-07-24 17:29:00 -07:00
pci x86/PCI: use dev_printk when possible 2008-07-28 15:32:26 -07:00
power x86: remove end_pfn in 64bit 2008-07-08 13:10:38 +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 x86: video/fbdev.c: add MODULE_LICENSE 2008-05-04 20:04:46 +02:00
xen Merge branch 'linus' into x86/x2apic 2008-07-25 13:08:16 +02:00
Kconfig Merge branch 'linus' into x86/core 2008-08-14 14:58:01 +02:00
Kconfig.cpu x86: fix crash due to missing debugctlmsr on AMD K6-3 2008-07-22 14:16:37 +02:00
Kconfig.debug x86: Fix help message for STRICT_DEVMEM config option 2008-07-21 13:04:08 -07:00
Makefile x86, RDC321x: add to mach-default 2008-07-26 13:51:46 +02:00
Makefile_32.cpu