diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-09-04 12:01:18 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-09-04 12:01:18 +0300 |
| commit | edc2988c548db05e33b921fed15821010bc74895 (patch) | |
| tree | b35860428acea35e5866d4cf007519ed943a85de /kernel/sched/sched.h | |
| parent | d82fed75294229abc9d757f08a4817febae6c4f4 (diff) | |
| parent | 81a84ad3cb5711cec79f4dd53a4ce026b092c432 (diff) | |
| download | linux-edc2988c548db05e33b921fed15821010bc74895.tar.xz | |
Merge branch 'linus' into locking/core, to fix up conflicts
Conflicts:
mm/page_alloc.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched/sched.h')
0 files changed, 0 insertions, 0 deletions