Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-04-10 14:30:45 -04:00
parent 32ed53b83e f68e556e23
commit 06eb4eafbd
4047 changed files with 104278 additions and 50193 deletions
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -66,7 +66,6 @@
 #include <net/inet_common.h>

 #include <asm/uaccess.h>
-#include <asm/system.h>

 /*
 *	The ICMP socket(s). This is the most convenient way to flow control