Skip to content
Commit f0ef0398 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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: default avatarIngo Molnar <mingo@elte.hu>
parents 16097439 31bbed52
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment