Merge branch 'linus' into timers/urgent, to pick up fixes

author Ingo Molnar <[email protected]>

Wed, 10 Aug 2016 12:36:23 +0000 (14:36 +0200)

committer Ingo Molnar <[email protected]>

Wed, 10 Aug 2016 12:36:23 +0000 (14:36 +0200)
author Ingo Molnar <[email protected]>
Wed, 10 Aug 2016 12:36:23 +0000 (14:36 +0200)
committer Ingo Molnar <[email protected]>
Wed, 10 Aug 2016 12:36:23 +0000 (14:36 +0200)
diff --cc arch/x86/kernel/apic/apic.c
Simple merge
diff --cc arch/x86/kernel/tsc.c
Simple merge
author	Ingo Molnar <[email protected]>
	Wed, 10 Aug 2016 12:36:23 +0000 (14:36 +0200)
committer	Ingo Molnar <[email protected]>
	Wed, 10 Aug 2016 12:36:23 +0000 (14:36 +0200)
		1	2
arch/x86/kernel/apic/apic.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/tsc.c	patch \|	diff1 \|	diff2 \|	blob \| history