| commit | 35dce1a99d010f3d738af4ce1b9b77302fdfe69c | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Wed Aug 26 08:29:02 2009 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Wed Aug 26 08:29:02 2009 +0200 |
| tree | e34a37de965a79a2ae301de4d0557f500111dde6 | |
| parent | 7cb2e3ee2aeec5b83ecadba929a2dc575dd4008f [diff] | |
| parent | 1c569f0264ea629c10bbab471dd0626ce4d3f19f [diff] |
Merge branch 'tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into tracing/core Conflicts: include/linux/tracepoint.h Signed-off-by: Ingo Molnar <mingo@elte.hu>