From: Ingo Molnar <mingo@elte.hu>
Date: Sat, 26 Jul 2008 14:29:23 +0000 (+0200)
Subject: Merge branch 'x86/x2apic' into x86/core
X-Git-Tag: v2.6.28-rc1~699^2^8~23^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6dec3a10a7a6093af10cef7ac56021150afd6451;p=pandora-kernel.git

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>
---

6dec3a10a7a6093af10cef7ac56021150afd6451
Reading git-diff-tree failed