Merge branch 'x86/core' into tracing/textedit
authorIngo Molnar <mingo@elte.hu>
Fri, 6 Mar 2009 15:44:14 +0000 (16:44 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 6 Mar 2009 15:45:01 +0000 (16:45 +0100)
commitf0ef03985130287c6c84ebe69416cf790e6cc00e
tree3ecb04cc4d82e5fc3ae5f1747e6da172ae8cbcb7
parent16097439703bcd38e9fe5608c12add6dacb825ea
parent31bbed527e7039203920c51c9fb48c27aed0820c
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>
18 files changed:
Documentation/kernel-parameters.txt
arch/x86/Kconfig
arch/x86/include/asm/cacheflush.h
arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
arch/x86/kernel/cpu/intel.c
arch/x86/kernel/dumpstack.c
arch/x86/kernel/process.c
arch/x86/mm/init_32.c
arch/x86/mm/init_64.c
include/asm-generic/vmlinux.lds.h
include/linux/sched.h
init/Kconfig
init/main.c
kernel/irq/handle.c
kernel/module.c
kernel/sched.c
kernel/softirq.c
kernel/trace/blktrace.c