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

Browse source

Conflicts:
	kernel/trace/trace_events.c

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

...

This commit is contained in:

Steven Rostedt 2010-08-16 11:17:30 -04:00 • committed by Steven Rostedt

parent da5cabf80e 1aa54bca6e

commit d244b6bd41

5 changed files with 169 additions and 69 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

kernel/trace/ring_buffer.c

View file

11

kernel/trace/trace.c

View file

219

kernel/trace/trace_events.c

View file

10

kernel/trace/trace_functions_graph.c

View file