Skip to content
Commit 92bf73e9 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/irq' into perfcounters/core 

( with manual semantic merge of arch/x86/kernel/cpu/perf_counter.c )
parents 447557ac 915b0d01
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment