Ingo Molnar 89034bc2c7 Merge branch 'linus' into tracing/core ...

Conflicts:
	kernel/trace/trace_events_filter.c

We use the tracing/core version.

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

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

24 KiB

Raw Blame History

View Raw