]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'x86/apic'
authorIngo Molnar <mingo@kernel.org>
Sun, 1 Nov 2015 10:24:07 +0000 (11:24 +0100)
committerIngo Molnar <mingo@kernel.org>
Sun, 1 Nov 2015 10:24:07 +0000 (11:24 +0100)
1  2 
arch/x86/kernel/apic/io_apic.c
drivers/clocksource/Makefile

Simple merge
Simple merge