Merge branch 'x86/ptrace' into x86/tsc
authorIngo Molnar <mingo@elte.hu>
Tue, 23 Dec 2008 15:29:31 +0000 (16:29 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 23 Dec 2008 15:29:31 +0000 (16:29 +0100)
Conflicts:
arch/x86/kernel/cpu/intel.c


Trivial merge