Merge branch 'linus' into sched/core, to pick up fixes
authorIngo Molnar <mingo@kernel.org>
Fri, 30 Sep 2016 08:44:27 +0000 (10:44 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 30 Sep 2016 08:44:27 +0000 (10:44 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
mm/huge_memory.c
mm/memory.c

Simple merge
diff --cc mm/memory.c
Simple merge