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

Conflicts:
	net/core/dev.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/b44.c
Simple merge

diff --cc drivers/net/ehea/ehea_main.c
Simple merge

diff --cc drivers/net/gianfar_ethtool.c
Simple merge

diff --cc drivers/net/r6040.c
Simple merge

diff --cc drivers/net/tg3.c
Simple merge

diff --cc drivers/net/tg3.h
index 8342190df0ff3af8d367305969f0da89b17b6010,be7ff138a7f98d58a4f4d4c8ff7fe70bb83911d9..4a1974804b9fcd0c6531c86f899c03834d0061db
--- 1/drivers/net/tg3.h
--- 2/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@@ -2811,9 -2755,11 +2811,9 @@@ struct tg3 
        struct vlan_group               *vlgrp;
  #endif
  
 -      struct tg3_rx_prodring_set      prodring[TG3_IRQ_MAX_VECS];
 -
  
        /* begin "everything else" cacheline(s) section */
-       struct rtnl_link_stats64        net_stats;
+       unsigned long                   rx_dropped;
        struct rtnl_link_stats64        net_stats_prev;
        struct tg3_ethtool_stats        estats;
        struct tg3_ethtool_stats        estats_prev;

diff --cc drivers/vhost/vhost.c
Simple merge

diff --cc include/linux/Kbuild
Simple merge

diff --cc net/bluetooth/l2cap.c
Simple merge

diff --cc net/core/dev.c
index b2269ac04cb8c22789cbe8b5b4d848ed0582aa2d,8e07109cc0ef30828406b3b6bab6ed2bc9d62125..6d4218cdb7392c1e8fd1e320aac4aefb754d80f9
--- 1/net/core/dev.c
--- 2/net/core/dev.c
+++ b/net/core/dev.c
@@@ -1483,9 -1484,8 +1483,9 @@@ int dev_forward_skb(struct net_device *
        skb_orphan(skb);
        nf_reset(skb);
  
 -      if (!(dev->flags & IFF_UP) ||
 -          (skb->len > (dev->mtu + dev->hard_header_len + VLAN_HLEN))) {
 +      if (unlikely(!(dev->flags & IFF_UP) ||
-                    (skb->len > (dev->mtu + dev->hard_header_len)))) {
++                   (skb->len > (dev->mtu + dev->hard_header_len + VLAN_HLEN)))) {
 +              atomic_long_inc(&dev->rx_dropped);
                kfree_skb(skb);
                return NET_RX_DROP;
        }

diff --cc net/rds/page.c
Simple merge

diff --cc net/tipc/subscr.c
Simple merge