From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 11 Jul 2008 08:46:50 +0000 (+0200)
Subject: Merge branch 'linus' into core/rcu
X-Git-Tag: v2.6.27-rc1~1070^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c81b2a1448bc6a2a9b2d6469fb0669fb4b25e5b;p=pandora-kernel.git

Merge branch 'linus' into core/rcu

Conflicts:

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

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

0c81b2a1448bc6a2a9b2d6469fb0669fb4b25e5b
Reading git-diff-tree failed