From: Ingo Molnar <mingo@kernel.org>
Date: Sun, 17 May 2015 05:57:31 +0000 (+0200)
Subject: Merge branch 'linus' into x86/asm, to resolve conflicts
X-Git-Tag: omap-for-v4.2/fixes-rc1^2~170^2~21^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75d95d84888cbd0024eb62ca7e72b3f7fe67dbdd;p=pandora-kernel.git

Merge branch 'linus' into x86/asm, to resolve conflicts

Conflicts:
	tools/testing/selftests/x86/Makefile
	tools/testing/selftests/x86/run_x86_tests.sh
---

75d95d84888cbd0024eb62ca7e72b3f7fe67dbdd
Reading git-diff-tree failed