| commit | 8f8ffe2485bcaa890800681451d380779cea06af | [log] [tgz] |
|---|---|---|
| author | Frederic Weisbecker <fweisbec@gmail.com> | Fri Sep 11 01:09:23 2009 +0200 |
| committer | Frederic Weisbecker <fweisbec@gmail.com> | Fri Sep 11 01:09:23 2009 +0200 |
| tree | 1d2ef3a27f1cab9a2b9014f4b75886a96a1ae8db | |
| parent | 70069577323e6f72b845166724f34b9858134437 [diff] | |
| parent | d28daf923ac5e4a0d7cecebae56f3e339189366b [diff] |
Merge commit 'tracing/core' into tracing/kprobes Conflicts: kernel/trace/trace_export.c kernel/trace/trace_kprobe.c Merge reason: This topic branch lacks an important build fix in tracing/core: 0dd7b74787eaf7858c6c573353a83c3e2766e674: tracing: Fix double CPP substitution in TRACE_EVENT_FN that prevents from multiple tracepoint headers inclusion crashes. Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>