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)
commitfdbdfefbabefcdf3f57560163b43fdc4cf95eb2f
tree1d0c420d4eaff48cf2486f10dded8d551241ee94
parent6731b0d611a1274f9e785fa0189ac2aeeabd0591
parenta0cba2179ea4c1820fce2ee046b6ed90ecc56196
Merge branch 'linus' into timers/urgent, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kernel/apic/apic.c
arch/x86/kernel/tsc.c