diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-12-04 10:30:35 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-12-04 10:30:35 +0100 |
| commit | 829cf31751aa1c50b1527c1e0c821c99246b5639 (patch) | |
| tree | a6542c021c3d3b78c5618319bc3b4a6aefa3f0e7 /kernel/locking | |
| parent | d78045306c41bd9334b956e4e7fa77cc72f06a40 (diff) | |
| parent | ecf7d01c229d11a44609c0067889372c91fb4f36 (diff) | |
Merge branch 'sched/urgent' into locking/core, to pick up scheduler fix we rely on
So we want to change a locking API, but the scheduler uses it, and a conflict
is generated by a recent scheduler fix.
Pick up the pending scheduler fixes to make life easier.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/locking')
0 files changed, 0 insertions, 0 deletions