Commit 74bf3cab authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'tracing/urgent' into tracing/core 

Conflicts:
	kernel/trace/ring_buffer.c
parents c7cc7730 4f5a7f40

There are no changes