Merge branch 'linus' into sched/core, to pick up fixes

author Ingo Molnar <mingo@kernel.org>

Fri, 30 Sep 2016 08:44:27 +0000 (10:44 +0200)

committer Ingo Molnar <mingo@kernel.org>

Fri, 30 Sep 2016 08:44:27 +0000 (10:44 +0200)
author Ingo Molnar <mingo@kernel.org>
Fri, 30 Sep 2016 08:44:27 +0000 (10:44 +0200)
committer Ingo Molnar <mingo@kernel.org>
Fri, 30 Sep 2016 08:44:27 +0000 (10:44 +0200)
diff --cc mm/huge_memory.c
Simple merge
diff --cc mm/memory.c
Simple merge
author	Ingo Molnar <mingo@kernel.org>
	Fri, 30 Sep 2016 08:44:27 +0000 (10:44 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Fri, 30 Sep 2016 08:44:27 +0000 (10:44 +0200)
		1	2
mm/huge_memory.c	patch \|	diff1 \|	diff2 \|	blob \| history
mm/memory.c	patch \|	diff1 \|	diff2 \|	blob \| history