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

Merge branch 'x86/ptrace' into x86/tsc 

Conflicts:
	arch/x86/kernel/cpu/intel.c
parents 345077cd f4166c54
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