Merge branch 'linus' into tracing/core

Merge reason: merge latest tracing fixes to avoid conflicts in
              kernel/trace/trace_events_filter.c with upcoming change

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar 2009-04-14 00:02:16 +02:00
commit b5c851a88a
815 changed files with 41389 additions and 46944 deletions

Some files were not shown because too many files have changed in this diff Show more