Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts: drivers/net/bonding/bond_main.c net/core/net-sysfs.c net/ipv6/addrconf.c
2010-11-19 13:13:47 -08:00
parent 0670b8ae66 0302b8622c
commit 24912420e9
27 changed files with 155 additions and 54 deletions
@@ -6,7 +6,6 @@
 #include <linux/if_link.h>
 #include <linux/if_addr.h>
 #include <linux/neighbour.h>
-#include <linux/netdevice.h>

 /* rtnetlink families. Values up to 127 are reserved for real address
 * families, values above 128 may be used arbitrarily.
@@ -606,6 +605,7 @@ struct tcamsg {
 #ifdef __KERNEL__

 #include <linux/mutex.h>
+#include <linux/netdevice.h>

 static __inline__ int rtattr_strcmp(const struct rtattr *rta, const char *str)
 {