From: H. Peter Anvin <hpa@zytor.com>
Date: Tue, 23 Feb 2010 00:25:18 +0000 (-0800)
Subject: Merge remote branch 'origin/x86/apic' into x86/mrst
X-Git-Tag: v2.6.34-rc1~7^2~21
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54b56170e4517e9606b245c3f805fc96baa059f0;p=pandora-kernel.git

Merge remote branch 'origin/x86/apic' into x86/mrst

Conflicts:
	arch/x86/kernel/apic/io_apic.c
---

54b56170e4517e9606b245c3f805fc96baa059f0
Reading git-diff-tree failed