From: H. Peter Anvin <hpa@zytor.com>
Date: Sun, 21 Feb 2010 05:51:42 +0000 (-0800)
Subject: Merge branch 'x86/urgent' into x86/irq
X-Git-Tag: v2.6.34-rc1~217^2~2^2
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=aef55d4922e62a0d887e60d87319f3718aec6ced;p=net-next-2.6.git

Merge branch 'x86/urgent' into x86/irq

Merge reason: conflict 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>
---

aef55d4922e62a0d887e60d87319f3718aec6ced