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)
commit7e3cbc3f774f31ecd88a51edae3d9377f60a4c00
treef5aa6a587ba2cf796d11c4e49682552580ba65a2
parent345077cd98ff5532b2d1158013c3fec7b1ae85ec
parentf4166c54bfe04f64603974058e44fbd7cfef0ccc
Merge branch 'x86/ptrace' into x86/tsc

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