Ingo Molnar fc6fc7f1b1 Merge branch 'linus' into x86/apic ...

Conflicts:
	arch/x86/mach-default/setup.c

Semantic conflict resolution:
	arch/x86/kernel/setup.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2009-02-22 20:05:19 +01:00

..

boot

x86 setup: a20: early timeout for a nonexistent keyboard controller

2009-02-02 14:52:00 -08:00

configs

Merge branches 'x86/acpi', 'x86/asm', 'x86/cpudetect', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/doc', 'x86/header-fixes', 'x86/headers' and 'x86/minor-fixes' into x86/core

2009-02-13 09:46:36 +01:00

crypto

crypto: crc32c-intel - Switch to shash

2008-12-25 11:01:37 +11:00

ia32

Merge branch 'linus' into x86/apic

2009-02-13 09:44:22 +01:00

include/asm

Merge branch 'linus' into x86/apic

2009-02-22 20:05:19 +01:00

kernel

Merge branch 'linus' into x86/apic

2009-02-22 20:05:19 +01:00

kvm

KVM: VMX: Flush volatile msrs before emulating rdmsr

2009-02-15 02:47:39 +02:00

lguest

x86, apic: remove genapic.h

2009-02-17 17:52:44 +01:00

lib

x86: use early clobbers in usercopy*.c

2009-01-21 09:43:17 +01:00

mach-voyager

Merge branch 'linus' into x86/apic

2009-02-22 20:05:19 +01:00

math-emu

x86: add %gs accessors for x86_32

2009-02-10 00:41:58 +01:00

mm

Merge branch 'linus' into x86/apic

2009-02-22 20:05:19 +01:00

oprofile

x86, apic: remove genapic.h

2009-02-17 17:52:44 +01:00

pci

x86, apic: remove genapic.h

2009-02-17 17:52:44 +01:00

power

x86, hibernate: fix breakage on x86_32 with CONFIG_NUMA set

2008-11-12 23:28:51 +01:00

vdso

x86: no stack protector for vdso

2009-02-10 00:41:56 +01:00

video

…

xen

x86, apic: remove genapic.h

2009-02-17 17:52:44 +01:00

Kconfig

x86, apic: fix build fallout of genapic changes

2009-02-17 13:13:25 +01:00

Kconfig.cpu

Merge branch 'x86/urgent' into core/percpu

2009-02-10 00:41:02 +01:00

Kconfig.debug

Merge branch 'linus' into x86/apic

2009-02-22 20:05:19 +01:00

Makefile

Merge branch 'core/percpu' into x86/core

2009-02-13 09:45:09 +01:00

Makefile_32.cpu

x86: merge winchip-2 and winchip-2a cpu choices

2008-10-13 10:22:48 +02:00