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

Merge branch 'x86/tsc' into tracing/core 

Merge it to resolve this incidental conflict between the BTS fixes/cleanups
and changes in x86/tsc:

Conflicts:
	arch/x86/kernel/cpu/intel.c
parents 30cd324e 7e3cbc3f
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