tree 6f82579cae6d6e39fa9f837a3c349ded51e19d14
parent 0729fbf3bc70870370b4f43d652f05a468dc68b8
parent 70ff05554f91a1edda1f11684da1dbde09e2feea
author Ingo Molnar <mingo@elte.hu> 1215766010 +0200
committer Ingo Molnar <mingo@elte.hu> 1215766010 +0200

Merge branch 'linus' into core/rcu

Conflicts:

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

Signed-off-by: Ingo Molnar <mingo@elte.hu>