From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 17 Jun 2009 16:21:41 +0000 (+0200)
Subject: Merge branch 'x86/urgent' into x86/mce3
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=813400060fe2824163cabd9afed4e476e7ce282e;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'x86/urgent' into x86/mce3

Conflicts:
	arch/x86/kernel/cpu/mcheck/mce_intel.c

Merge reason: merge with an urgent-branch MCE fix.

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

813400060fe2824163cabd9afed4e476e7ce282e