From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 11 Jun 2009 21:31:52 +0000 (+0200)
Subject: Merge branch 'linus' into x86/mce3
X-Git-Tag: v2.6.31-rc1~349^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d5959723e1db3fd7323c198a50c16cecf96c7a9;p=pandora-kernel.git

Merge branch 'linus' into x86/mce3

Conflicts:
	arch/x86/kernel/cpu/mcheck/mce_64.c
	arch/x86/kernel/irq.c

Merge reason: Resolve the conflicts above.

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

0d5959723e1db3fd7323c198a50c16cecf96c7a9
Reading git-diff-tree failed