Skip to content
Snippets Groups Projects
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
No related merge requests found
Showing
with 22 additions and 21 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment