From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 16 Jun 2008 08:17:15 +0000 (+0200)
Subject: Merge branch 'linus' into x86/nmi
X-Git-Tag: v2.6.27-rc1~1106^2~245^2~2
X-Git-Url: http://pilppa.org/gitweb/?a=commitdiff_plain;h=28638ea4f8adb63f837e4436560ab16ab0388587;p=linux-2.6-omap-h63xx.git

Merge branch 'linus' into x86/nmi

Conflicts:

	arch/x86/kernel/nmi_32.c
---

28638ea4f8adb63f837e4436560ab16ab0388587