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)
Conflicts:

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

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

Trivial merge