tree b35860428acea35e5866d4cf007519ed943a85de
parent d82fed75294229abc9d757f08a4817febae6c4f4
parent 81a84ad3cb5711cec79f4dd53a4ce026b092c432
author Ingo Molnar <mingo@kernel.org> 1504515678 +0200
committer Ingo Molnar <mingo@kernel.org> 1504515678 +0200

Merge branch 'linus' into locking/core, to fix up conflicts

 Conflicts:
	mm/page_alloc.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>