Skip to content
Commit 72c26c9a authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into tracing/blktrace 



Conflicts:
	block/blktrace.c

Semantic merge:
	kernel/trace/blktrace.c

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 37bd824a ba95fd47
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment