diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-15 20:08:55 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-15 20:08:55 +0100 |
| commit | 9abd60304816a5b0fd9e51034f78e3eaed89f901 (patch) | |
| tree | 5fb431bbfd133b6e2d19dabd196d87ea5bf281cf /arch/x86/kernel/process.c | |
| parent | 5fb896a4e916e72efec4772b66be1cce3d6a9143 (diff) | |
| parent | f9aa28adfc6a4b01268ebb6d88566cca8627905f (diff) | |
| download | linux-9abd60304816a5b0fd9e51034f78e3eaed89f901.tar.gz linux-9abd60304816a5b0fd9e51034f78e3eaed89f901.tar.bz2 linux-9abd60304816a5b0fd9e51034f78e3eaed89f901.zip | |
Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core
Conflicts:
kernel/trace/trace_mmiotrace.c
Diffstat (limited to 'arch/x86/kernel/process.c')
0 files changed, 0 insertions, 0 deletions