| commit | edc2988c548db05e33b921fed15821010bc74895 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Mon Sep 04 11:01:18 2017 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Mon Sep 04 11:01:18 2017 +0200 |
| tree | b35860428acea35e5866d4cf007519ed943a85de | |
| parent | d82fed75294229abc9d757f08a4817febae6c4f4 [diff] | |
| parent | 81a84ad3cb5711cec79f4dd53a4ce026b092c432 [diff] |
Merge branch 'linus' into locking/core, to fix up conflicts Conflicts: mm/page_alloc.c Signed-off-by: Ingo Molnar <mingo@kernel.org>