From: Ingo Molnar <mingo@kernel.org>
Date: Mon, 23 Mar 2015 10:13:15 +0000 (+0100)
Subject: Merge tag 'v4.0-rc5' into x86/asm, to resolve conflicts
X-Git-Tag: omap-for-v4.1/fixes-rc1~195^2~73
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4518ab90f63cd5bea3ddc15341162debc34442b;p=pandora-kernel.git

Merge tag 'v4.0-rc5' into x86/asm, to resolve conflicts

Conflicts:
	arch/x86/kernel/entry_64.S

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

e4518ab90f63cd5bea3ddc15341162debc34442b
Reading git-diff-tree failed