]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'sched/urgent' into sched/core, to pick up fixes and resolve conflicts
authorIngo Molnar <mingo@kernel.org>
Tue, 20 Oct 2015 08:18:16 +0000 (10:18 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 20 Oct 2015 08:18:16 +0000 (10:18 +0200)
commit6af597de62a365dfec6021b9796aa302044e7cc3
tree23e365cc4a4e6dff940f5acbb466edbe28160d68
parent558a65bc31a0c7811b34dad32f51f47c55a40000
parent5aa5050787f449e7eaef2c5ec93c7b357aa7dcdc
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>
kernel/sched/core.c
kernel/sched/fair.c