Merge branch 'linus' into timers/urgent, to pick up fixes
authorIngo Molnar <mingo@kernel.org>
Wed, 10 Aug 2016 12:36:23 +0000 (14:36 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 10 Aug 2016 12:36:23 +0000 (14:36 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
arch/x86/kernel/apic/apic.c
arch/x86/kernel/tsc.c

Simple merge
Simple merge