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

Merge branch 'linus' into locking/core, to resolve conflicts 



Conflicts:
	kernel/locking/lockdep.c

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents fed0764f 0cbb0b92
Hide whitespace changes
Inline Side-by-side
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