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

Merge branch 'linus' into core/rcu 



Conflicts:

	include/linux/rculist.h
	kernel/rcupreempt.c

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 0729fbf3 70ff0555
Expand all 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