Merge branch 'core/rcu' into core/rcu-for-linus

2008-07-15 21:10:12 +02:00
parent b9d2252c1e 199a952876
commit 6c9fcaf2ee
33 changed files with 1347 additions and 530 deletions
--- a/net/netlabel/netlabel_domainhash.c
+++ b/net/netlabel/netlabel_domainhash.c
@@ -30,8 +30,7 @@
 */

 #include <linux/types.h>
-#include <linux/rcupdate.h>
-#include <linux/list.h>
+#include <linux/rculist.h>
 #include <linux/skbuff.h>
 #include <linux/spinlock.h>
 #include <linux/string.h>