From: Ingo Molnar <mingo@kernel.org>
Date: Wed, 6 Nov 2013 06:50:37 +0000 (+0100)
Subject: Merge branch 'sched/core' into core/locking, to prepare the kernel/locking/ file... 
X-Git-Tag: v3.13-rc1~91^2~16
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c90423d1de12fbeaf0c898e1db0e962de347302b;p=pandora-kernel.git

Merge branch 'sched/core' into core/locking, to prepare the kernel/locking/ file move

Conflicts:
	kernel/Makefile

There are conflicts in kernel/Makefile due to file moving in the
scheduler tree - resolve them.

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

c90423d1de12fbeaf0c898e1db0e962de347302b
Reading git-diff-tree failed