tree f4d8511f023e3e0c203baf889d4a0f3925882381
parent 29308333fbe2cc61258c1c470f9403960428beb2
parent 10a010f6953b5a14ba2f0be40a4fce1bea220875
author Ingo Molnar <mingo@elte.hu> 1217082563 +0200
committer Ingo Molnar <mingo@elte.hu> 1217082563 +0200

Merge branch 'x86/x2apic' into x86/core

Conflicts:

	include/asm-x86/i8259.h
	include/asm-x86/msidef.h

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