| commit | d7a4b414eed51f1653bb05ebe84122bf9a7ae18b | [log] [tgz] |
|---|---|---|
| author | Frederic Weisbecker <fweisbec@gmail.com> | Wed Sep 23 23:08:43 2009 +0200 |
| committer | Frederic Weisbecker <fweisbec@gmail.com> | Wed Sep 23 23:08:43 2009 +0200 |
| tree | bd6603a0c27de4c138a1767871897e9cd3e1a1d2 | |
| parent | 1f0ab40976460bc4673fa204ce917a725185d8f2 [diff] | |
| parent | a724eada8c2a7b62463b73ccf73fd0bb6e928aeb [diff] |
Merge commit 'linus/master' into tracing/kprobes Conflicts: kernel/trace/Makefile kernel/trace/trace.h kernel/trace/trace_event_types.h kernel/trace/trace_export.c Merge reason: Sync with latest significant tracing core changes.