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

Conflicts:
	drivers/net/pcmcia/smc91c92_cs.c
	drivers/net/virtio_net.c

diff --cc drivers/net/e1000e/netdev.c
Simple merge

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

diff --cc drivers/net/igb/igb_ethtool.c
Simple merge

diff --cc drivers/net/igb/igb_main.c
Simple merge

diff --cc drivers/net/pcmcia/smc91c92_cs.c
index ad2267646187dc48df2054ab666bdd056bce1884,fd9d6e34fda433c8605267517c69fb72958e58b8..408f3d7b15450a0eafd71c4213db2d04adc80936
--- 1/drivers/net/pcmcia/smc91c92_cs.c
--- 2/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@@ -1618,14 -1621,10 +1621,10 @@@ static void set_rx_mode(struct net_devi
        rx_cfg_setting = RxStripCRC | RxEnable | RxAllMulti;
      else {
        if (!netdev_mc_empty(dev)) {
 -          struct dev_mc_list *mc_addr;
 +          struct netdev_hw_addr *ha;
  
 -          netdev_for_each_mc_addr(mc_addr, dev) {
 -              u_int position = ether_crc(6, mc_addr->dmi_addr);
 +          netdev_for_each_mc_addr(ha, dev) {
 +              u_int position = ether_crc(6, ha->addr);
- #ifndef final_version         /* Verify multicast address. */
-               if ((ha->addr[0] & 1) == 0)
-                   continue;
- #endif
                multicast_table[position >> 29] |= 1 << ((position >> 26) & 7);
            }
        }

diff --cc drivers/net/virtio_net.c
index b0a85d0387962b6ce2394637f9ae6dbbac5f6684,b0577dd1a42dc838eae1e9ca6bb14bc018192b4d..73116512ca0562e19f28424c73f0b9b1dc4d96e2
--- 1/drivers/net/virtio_net.c
--- 2/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@@ -327,8 -324,10 +327,9 @@@ static int add_recvbuf_small(struct vir
  {
        struct sk_buff *skb;
        struct skb_vnet_hdr *hdr;
 -      struct scatterlist sg[2];
        int err;
  
+       sg_init_table(sg, 2);
        skb = netdev_alloc_skb_ip_align(vi->dev, MAX_PACKET_LEN);
        if (unlikely(!skb))
                return -ENOMEM;