diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-10-20 10:18:16 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-10-20 10:18:16 +0200 |
| commit | 6af597de62a365dfec6021b9796aa302044e7cc3 (patch) | |
| tree | 23e365cc4a4e6dff940f5acbb466edbe28160d68 /kernel/stop_machine.c | |
| parent | sched/x86: Fix typo in __switch_to() comments (diff) | |
| parent | sched/deadline: Fix migration of SCHED_DEADLINE tasks (diff) | |
| download | linux-6af597de62a365dfec6021b9796aa302044e7cc3.tar.xz linux-6af597de62a365dfec6021b9796aa302044e7cc3.zip | |
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>
Diffstat (limited to 'kernel/stop_machine.c')
0 files changed, 0 insertions, 0 deletions