summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/apic/apic.c
AgeCommit message (Collapse)Author
2009-02-17Merge branch 'x86/apic' into perfcounters/coreIngo Molnar
Conflicts: arch/x86/kernel/cpu/perfctr-watchdog.c