| commit | 9abd60304816a5b0fd9e51034f78e3eaed89f901 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Sun Feb 15 20:08:55 2009 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Sun Feb 15 20:08:55 2009 +0100 |
| tree | 5fb431bbfd133b6e2d19dabd196d87ea5bf281cf | |
| parent | 5fb896a4e916e72efec4772b66be1cce3d6a9143 [diff] | |
| parent | f9aa28adfc6a4b01268ebb6d88566cca8627905f [diff] |
Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core Conflicts: kernel/trace/trace_mmiotrace.c