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

Merge branch 'x86/irq' into x86/apic

Merge reason:
	Conflicts in arch/x86/kernel/apic/io_apic.c

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

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---

d02e30c31c57683a66ed68a1bcff900ca78f6d56
Reading git-diff-tree failed