Merge branch 'linus' into tracing/core

Browse source

Conflicts:
	kernel/trace/trace_events_filter.c

We use the tracing/core version.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

...

This commit is contained in:

Ingo Molnar 2009-08-11 14:19:09 +02:00

parent fb82ad7198 85dfd81dc5

commit 89034bc2c7

1029 changed files with 32045 additions and 16214 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

183

include/trace/ftrace.h

View file