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

Merge branch 'linus' into x86/apic 



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

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

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents ef1f87aa 770824bd
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