tree 3ecb04cc4d82e5fc3ae5f1747e6da172ae8cbcb7
parent 16097439703bcd38e9fe5608c12add6dacb825ea
parent 31bbed527e7039203920c51c9fb48c27aed0820c
author Ingo Molnar <mingo@elte.hu> 1236354254 +0100
committer Ingo Molnar <mingo@elte.hu> 1236354301 +0100

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>