| commit | 902b31941327a0e9c0ca9eb7750414ae41bf8a89 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Tue Jun 20 12:28:21 2017 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Tue Jun 20 12:28:21 2017 +0200 |
| tree | 300f4226c87e6df403cda861ab6766b23d278f09 | |
| parent | c5ae366e12b2bd56fc7d7e9d484836bec9ddc110 [diff] | |
| parent | 2055da97389a605c8a00d163d40903afbe413921 [diff] |
Merge branch 'WIP.sched/core' into sched/core Conflicts: kernel/sched/Makefile Pick up the waitqueue related renames - it didn't get much feedback, so it appears to be uncontroversial. Famous last words? ;-) Signed-off-by: Ingo Molnar <mingo@kernel.org>