From: Ingo Molnar <mingo@kernel.org>
Date: Tue, 24 Mar 2015 20:14:07 +0000 (+0100)
Subject: Merge branch 'x86/urgent' into x86/asm, to resolve conflict
X-Git-Tag: omap-for-v4.1/fixes-rc1~195^2~52
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06ab9c1ba6a19977432b6906b0eee84804212dc6;p=pandora-kernel.git

Merge branch 'x86/urgent' into x86/asm, to resolve conflict

Conflicts:
	arch/x86/kernel/entry_64.S

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

06ab9c1ba6a19977432b6906b0eee84804212dc6
Reading git-diff-tree failed