Merge branch 'linus' into locking/core, to pick up fixes
authorIngo Molnar <mingo@kernel.org>
Fri, 25 Aug 2017 09:04:51 +0000 (11:04 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 25 Aug 2017 09:04:51 +0000 (11:04 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
arch/x86/Kconfig
arch/x86/entry/entry_64.S
drivers/clocksource/arm_arch_timer.c
drivers/gpu/drm/i915/i915_debugfs.c
include/linux/sched.h
lib/Kconfig.debug
mm/huge_memory.c
mm/page_alloc.c
net/ipv4/udp.c
net/ipv6/udp.c
scripts/Makefile.build

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc mm/page_alloc.c
Simple merge
diff --cc net/ipv4/udp.c
Simple merge
diff --cc net/ipv6/udp.c
Simple merge
Simple merge