From: Ingo Molnar <mingo@kernel.org>
Date: Tue, 2 Jun 2015 06:05:42 +0000 (+0200)
Subject: Merge branch 'linus' into sched/core, to resolve conflict
X-Git-Tag: omap-for-v4.2/fixes-rc1^2~136^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f407a8258610169cd8e975dba7f0b2824562014c;p=pandora-kernel.git

Merge branch 'linus' into sched/core, to resolve conflict

Conflicts:
	arch/sparc/include/asm/topology_64.h

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

f407a8258610169cd8e975dba7f0b2824562014c
Reading git-diff-tree failed