From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 8 Jul 2008 10:17:08 +0000 (+0200)
Subject: Merge branch 'x86/nmi' into x86/devel
X-Git-Tag: v2.6.27-rc1~1106^2~245
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b62ac9a2b859f932afd5625362c927111b7dd9b;p=pandora-kernel.git

Merge branch 'x86/nmi' into x86/devel

Conflicts:

	arch/x86/kernel/nmi.c
	arch/x86/kernel/nmi_32.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

4b62ac9a2b859f932afd5625362c927111b7dd9b
Reading git-diff-tree failed