| commit | 6af597de62a365dfec6021b9796aa302044e7cc3 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Tue Oct 20 10:18:16 2015 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Tue Oct 20 10:18:16 2015 +0200 |
| tree | 23e365cc4a4e6dff940f5acbb466edbe28160d68 | |
| parent | 558a65bc31a0c7811b34dad32f51f47c55a40000 [diff] | |
| parent | 5aa5050787f449e7eaef2c5ec93c7b357aa7dcdc [diff] |
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>