From: Ingo Molnar <mingo@kernel.org>
Date: Tue, 20 Oct 2015 08:18:16 +0000 (+0200)
Subject: Merge branch 'sched/urgent' into sched/core, to pick up fixes and resolve conflicts
X-Git-Tag: v4.4-rc1~153^2~8
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6af597de62a365dfec6021b9796aa302044e7cc3;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'sched/urgent' into sched/core, to pick up fixes and resolve conflicts

Conflicts:
	kernel/sched/fair.c

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

6af597de62a365dfec6021b9796aa302044e7cc3