From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 4 Jan 2011 08:43:42 +0000 (+0100)
Subject: Merge commit 'v2.6.37-rc8' into x86/apic
X-Git-Tag: v2.6.38-rc1~486^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc030d6cb9532877c1c5a3f5e7123344fa24a285;p=pandora-kernel.git

Merge commit 'v2.6.37-rc8' into x86/apic

Conflicts:
	arch/x86/include/asm/io_apic.h

Merge reason: move to a fresh -rc, resolve the conflict.

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

bc030d6cb9532877c1c5a3f5e7123344fa24a285
Reading git-diff-tree failed