Commit 89034bc2 authored 15 years ago by Ingo Molnar

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>

No related branches found

No related tags found

Showing with 1509 additions and 2245 deletions

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Please register or to comment