Skip to content
Commit 0b6de009 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/apic' into perfcounters/core 

Conflicts:
	arch/x86/kernel/cpu/perfctr-watchdog.c
parents 37a25424 f62bae50
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment