Skip to content
GitLab
Commit 89034bc2 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into tracing/core 



Conflicts:
	kernel/trace/trace_events_filter.c

We use the tracing/core version.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents fb82ad71 85dfd81d
Hide whitespace changes
Inline Side-by-side
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment