Ingo Molnar d84705969f Merge branch 'x86/apic' into x86-v28-for-linus-phase4-B ...

Conflicts:
	arch/x86/kernel/apic_32.c
	arch/x86/kernel/apic_64.c
	arch/x86/kernel/setup.c
	drivers/pci/intel-iommu.c
	include/asm-x86/cpufeature.h
	include/asm-x86/dma-mapping.h

2008-10-11 20:17:36 +02:00

..

boot

Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/doc', 'x86/exports', 'x86/fpu', 'x86/gart', 'x86/idle', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/oprofile', 'x86/paravirt', 'x86/reboot', 'x86/sparse-fixes', 'x86/tsc', 'x86/urgent' and 'x86/vmalloc' into x86-v28-for-linus-phase1

2008-10-06 18:17:07 +02:00

configs

x86: additional defconfig updates

2008-09-05 18:57:14 +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

x86: kill sys32_pause

2008-09-06 18:44:47 +02:00

kernel

Merge branch 'x86/apic' into x86-v28-for-linus-phase4-B

2008-10-11 20:17:36 +02:00

kvm

KVM: VMX: Always return old for clear_flush_young() when using EPT

2008-09-11 11:48:19 +03:00

lguest

Merge branch 'linus' into x86/x2apic

2008-08-11 11:19:20 +02:00

lib

x86: msr-on-cpu: remove unnecessary level of abstraction

2008-08-25 22:45:50 -07: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: mach-numaq to numaq

2008-07-26 16:31:35 +02:00

mach-rdc321x

removed unused #include <linux/version.h>'s

2008-08-23 12:14:12 -07:00

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 branch 'linus' into x86/pat2

2008-10-10 19:30:08 +02:00

oprofile

Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/doc', 'x86/exports', 'x86/fpu', 'x86/gart', 'x86/idle', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/oprofile', 'x86/paravirt', 'x86/reboot', 'x86/sparse-fixes', 'x86/tsc', 'x86/urgent' and 'x86/vmalloc' into x86-v28-for-linus-phase1

2008-10-06 18:17:07 +02:00

pci

Merge branch 'x86/apic' into x86-v28-for-linus-phase4-B

2008-10-11 20:17:36 +02:00

power

x86, cleanup: use X86_CR4_PGE in x86/power/hibernate_asm_32.S

2008-08-20 11:52:47 +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 'x86/apic' into x86-v28-for-linus-phase4-B

2008-10-11 20:17:36 +02:00

Kconfig

Merge branch 'x86/apic' into x86-v28-for-linus-phase4-B

2008-10-11 20:17:36 +02:00

Kconfig.cpu

Merge commit 'v2.6.27-rc7' into x86/pebs

2008-09-24 09:56:20 +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

x86: move i386 and x86_64 Makefiles to arch/x86

2007-10-25 22:27:34 +02:00