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

Conflicts:
	drivers/net/virtio_net.c

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

diff --cc drivers/net/bonding/bond_main.c
Simple merge

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

diff --cc drivers/net/virtio_net.c
index 3d0033920224715360c67a75c608f9a7f42da17b,e67d16c2e5f3a950e3730764e30380423c597a16..a6f1e19159d8e19b1d581c48cf28f96aec93cffe
--- 1/drivers/net/virtio_net.c
--- 2/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@@ -951,8 -740,7 +951,9 @@@ static int virtnet_probe(struct virtio_
                goto unregister;
        }
  
 +      vi->status = VIRTIO_NET_S_LINK_UP;
 +      virtnet_update_status(vi);
+       netif_carrier_on(dev);
  
        pr_debug("virtnet: registered device %s\n", dev->name);
        return 0;

diff --cc net/core/dev.c
Simple merge

diff --cc net/ipv6/sit.c
Simple merge