From: H. Peter Anvin <hpa@zytor.com>
Date: Mon, 1 Jun 2009 22:13:02 +0000 (-0700)
Subject: Merge branch 'irq/numa' into x86/mce3
X-Git-Tag: v2.6.31-rc1~349^2~26
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48b1fddbb100a64f3983ca9768b8ea629a09aa20;p=pandora-kernel.git

Merge branch 'irq/numa' into x86/mce3

Merge reason: arch/x86/kernel/irqinit_{32,64}.c unified in irq/numa
and modified in x86/mce3; this merge resolves the conflict.

Conflicts:
	arch/x86/kernel/irqinit.c

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

48b1fddbb100a64f3983ca9768b8ea629a09aa20
Reading git-diff-tree failed