From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 7 Jan 2011 13:14:15 +0000 (+0100)
Subject: Merge branch 'linus' into x86/apic-cleanups
X-Git-Tag: v2.6.38-rc1~458^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c2a48cf65580a276552151eb8f78d78c55b828e;p=pandora-kernel.git

Merge branch 'linus' into x86/apic-cleanups

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

Merge reason: Resolve the conflict, update to a more recent -rc base

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

1c2a48cf65580a276552151eb8f78d78c55b828e
Reading git-diff-tree failed