| commit | 7e3cbc3f774f31ecd88a51edae3d9377f60a4c00 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Tue Dec 23 16:29:31 2008 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Tue Dec 23 16:29:31 2008 +0100 |
| tree | f5aa6a587ba2cf796d11c4e49682552580ba65a2 | |
| parent | 345077cd98ff5532b2d1158013c3fec7b1ae85ec [diff] | |
| parent | f4166c54bfe04f64603974058e44fbd7cfef0ccc [diff] |
Merge branch 'x86/ptrace' into x86/tsc Conflicts: arch/x86/kernel/cpu/intel.c