Merge bk://linux-bt.bkbits.net/bt-2.5

into nuts.ninka.net:/disk1/davem/BK/net-2.5

include/linux/netdevice.h

@@ -28,8 +28,6 @@
 #include <linux/if.h>
 #include <linux/if_ether.h>
 #include <linux/if_packet.h>
-#include <linux/device.h>
-#include <linux/percpu.h>
 
 #include <asm/atomic.h>
 #include <asm/cache.h>
@@ -37,6 +35,8 @@
 
 #ifdef __KERNEL__
 #include <linux/config.h>
+#include <linux/device.h>
+#include <linux/percpu.h>
 
 struct divert_blk;
 struct vlan_group;

net/ipv4/ip_input.c

@@ -201,7 +201,7 @@ static inline int ip_local_deliver_finish(struct sk_buff *skb)
 
 #ifdef CONFIG_NETFILTER_DEBUG
 	nf_debug_ip_local_deliver(skb);
-	skb->nf_debug =3D 0;
+	skb->nf_debug = 0;
 #endif /*CONFIG_NETFILTER_DEBUG*/
 
 	__skb_pull(skb, ihl);