From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 10 Oct 2008 17:50:00 +0000 (+0200)
Subject: Merge branch 'x86/apic' into x86-v28-for-linus-phase4-B
X-Git-Tag: v2.6.28-rc1~711^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d84705969f898f294bc3fc32eca33580f14105bd;p=pandora-kernel.git

Merge branch 'x86/apic' into x86-v28-for-linus-phase4-B

Conflicts:
	arch/x86/kernel/apic_32.c
	arch/x86/kernel/apic_64.c
	arch/x86/kernel/setup.c
	drivers/pci/intel-iommu.c
	include/asm-x86/cpufeature.h
	include/asm-x86/dma-mapping.h
---

d84705969f898f294bc3fc32eca33580f14105bd
Reading git-diff-tree failed