| commit | d244b6bd41e09ecbb09c738cc2c108be227398c8 | [log] [tgz] |
|---|---|---|
| author | Steven Rostedt <srostedt@redhat.com> | Mon Aug 16 11:17:30 2010 -0400 |
| committer | Steven Rostedt <rostedt@goodmis.org> | Mon Aug 16 11:17:30 2010 -0400 |
| tree | 848c6a8a0d6f83929daf43d63e241dc8072066ac | |
| parent | da5cabf80e2433131bf0ed8993abc0f7ea618c73 [diff] | |
| parent | 1aa54bca6ee0d07ebcafb8ca8074b624d80724aa [diff] |
Merge branch 'tip/perf/urgent-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into trace/tip/perf/urgent-4 Conflicts: kernel/trace/trace_events.c Signed-off-by: Steven Rostedt <rostedt@goodmis.org>