Merge branch 'linus' into core/rcu

Conflicts:

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

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar 2008-07-11 10:46:50 +02:00
commit 0c81b2a144
371 changed files with 11114 additions and 1562 deletions