Merge branch 'linus' into core/rcu
authorIngo Molnar <mingo@elte.hu>
Fri, 11 Jul 2008 08:46:50 +0000 (10:46 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 11 Jul 2008 08:46:50 +0000 (10:46 +0200)
commit0c81b2a1448bc6a2a9b2d6469fb0669fb4b25e5b
tree6f82579cae6d6e39fa9f837a3c349ded51e19d14
parent0729fbf3bc70870370b4f43d652f05a468dc68b8
parent70ff05554f91a1edda1f11684da1dbde09e2feea
Merge branch 'linus' into core/rcu

Conflicts:

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

Signed-off-by: Ingo Molnar <mingo@elte.hu>
include/linux/dcache.h
kernel/rcuclassic.c
kernel/rcupreempt.c