Merge branch 'linus' into locking/core, to fix up conflicts
 Conflicts:
	mm/page_alloc.c
Signed-off-by:  Ingo Molnar <mingo@kernel.org>
Ingo Molnar <mingo@kernel.org>
Loading
Please register or sign in to comment
Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more
 Conflicts:
	mm/page_alloc.c
Signed-off-by:  Ingo Molnar <mingo@kernel.org>
Ingo Molnar <mingo@kernel.org>