tree f5aa6a587ba2cf796d11c4e49682552580ba65a2
parent 345077cd98ff5532b2d1158013c3fec7b1ae85ec
parent f4166c54bfe04f64603974058e44fbd7cfef0ccc
author Ingo Molnar <mingo@elte.hu> 1230046171 +0100
committer Ingo Molnar <mingo@elte.hu> 1230046171 +0100

Merge branch 'x86/ptrace' into x86/tsc

Conflicts:
	arch/x86/kernel/cpu/intel.c