Merge nuts.ninka.net:/home/davem/src/BK/network-2.5

into nuts.ninka.net:/home/davem/src/BK/net-2.5

net/core/flow.c

@@ -18,6 +18,7 @@
 #include <linux/percpu.h>
 #include <linux/bitops.h>
 #include <linux/notifier.h>
+#include <linux/cpu.h>
 #include <net/flow.h>
 #include <asm/atomic.h>
 #include <asm/semaphore.h>

net/ipv4/af_inet.c

@@ -1134,7 +1134,7 @@ static int __init inet_init(void)
 		printk(KERN_CRIT "inet_init: Cannot add TCP protocol\n");
 #ifdef CONFIG_IP_MULTICAST
 	if (inet_add_protocol(&igmp_protocol, IPPROTO_IGMP) < 0)
-		printk(KERN_CRIT "inet_init: Cannot add TCP protocol\n");
+		printk(KERN_CRIT "inet_init: Cannot add IGMP protocol\n");
 #endif
 
 	/* Register the socket-side information for inet_create. */