Ingo Molnar f0ef039851 Merge branch 'x86/core' into tracing/textedit ...

Conflicts:
	arch/x86/Kconfig
	block/blktrace.c
	kernel/irq/handle.c

Semantic conflict:
	kernel/trace/blktrace.c

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

2009-03-06 16:45:01 +01:00

..

boot

Merge branches 'x86/apic', 'x86/cpu', 'x86/fixmap', 'x86/mm', 'x86/sched', 'x86/setup-lzma', 'x86/signal' and 'x86/urgent' into x86/core

2009-03-04 02:22:31 +01:00

configs

Merge branches 'x86/apic', 'x86/defconfig', 'x86/memtest', 'x86/mm' and 'linus' into x86/core

2009-02-26 06:31:32 +01:00

crypto

crypto: crc32c-intel - Switch to shash

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

ia32

x86: ia32_signal: introduce {get|set}_user_seg()

2009-02-22 17:54:47 +01:00

include/asm

Merge branch 'x86/core' into tracing/textedit

2009-03-06 16:45:01 +01:00

kernel

Merge branch 'x86/core' into tracing/textedit

2009-03-06 16:45:01 +01:00

kvm

Merge branch 'linus' into tracing/blktrace

2009-02-19 09:00:35 +01:00

lguest

x86: remove the Voyager 32-bit subarch

2009-02-23 00:54:01 +01:00

lib

x86: use _types.h headers in asm where available

2009-02-13 11:35:01 -08:00

math-emu

Merge branch 'x86/urgent' into x86/core

2009-03-05 21:48:50 +01:00

mm

Merge branch 'x86/core' into tracing/textedit

2009-03-06 16:45:01 +01:00

oprofile

x86: oprofile: don't set counter width from cpuid on Core2

2009-03-03 12:04:22 +01:00

pci

x86, apic: remove genapic.h

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

power

x86: use _types.h headers in asm where available

2009-02-13 11:35:01 -08:00

vdso

x86, mm: rename TASK_SIZE64 => TASK_SIZE_MAX

2009-02-21 00:09:44 +01:00

video

…

xen

Merge branch 'x86/core' into core/percpu

2009-03-04 02:29:19 +01:00

Kconfig

Merge branch 'x86/core' into tracing/textedit

2009-03-06 16:45:01 +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