tree 349be736a3b56a64c8835df03f127959bfc6e0e0
parent 446d27338d3b422dd3dfe496d0f362230994d059
parent aa3341a168883654d1b13f5931c5ed2762537831
author Ingo Molnar <mingo@elte.hu> 1220599281 +0200
committer Ingo Molnar <mingo@elte.hu> 1220599281 +0200

Merge branch 'x86/x2apic' into x86/core

Conflicts:
	arch/x86/kernel/cpu/common_64.c

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