From: Ingo Molnar <mingo@kernel.org>
Date: Wed, 8 Apr 2015 07:01:54 +0000 (+0200)
Subject: Merge tag 'v4.0-rc7' into x86/asm, to resolve conflicts
X-Git-Tag: omap-for-v4.1/fixes-rc1~195^2~16
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4bcc7827b02feea2c762fa6d46a1bffb300d7403;p=pandora-kernel.git

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

Conflicts:
	arch/x86/kernel/entry_64.S

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

4bcc7827b02feea2c762fa6d46a1bffb300d7403
Reading git-diff-tree failed