Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Fri, 31 Oct 2008 07:17:34 +0000 (00:17 -0700)]
Conflicts:

drivers/net/wireless/p54/p54common.c

24 files changed:
1  2 
MAINTAINERS
drivers/net/amd8111e.c
drivers/net/arm/at91_ether.c
drivers/net/bonding/bond_main.c
drivers/net/gianfar.c
drivers/net/ibm_newemac/core.c
drivers/net/myri10ge/myri10ge.c
drivers/net/pppoe.c
drivers/net/smc91x.c
drivers/net/tulip/dmfe.c
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/libertas/cmd.c
drivers/net/wireless/libertas/scan.c
drivers/net/wireless/p54/p54common.c
drivers/net/wireless/p54/p54pci.c
drivers/s390/net/qeth_l2_main.c
include/linux/kernel.h
include/net/sock.h
net/core/net_namespace.c
net/core/pktgen.c
net/ipv4/cipso_ipv4.c
net/netlabel/netlabel_addrlist.c
net/sunrpc/xprtsock.c
net/xfrm/xfrm_policy.c

diff --cc MAINTAINERS
Simple merge
Simple merge
@@@ -1078,10 -1080,11 +1078,11 @@@ static int __init at91ether_setup(unsig
                init_timer(&lp->check_timer);
                lp->check_timer.data = (unsigned long)dev;
                lp->check_timer.function = at91ether_check_link;
-       }
+       } else if (lp->board_data.phy_irq_pin >= 32)
+               gpio_request(lp->board_data.phy_irq_pin, "ethernet_phy");
  
        /* Display ethernet banner */
 -      printk(KERN_INFO "%s: AT91 ethernet at 0x%08x int=%d %s%s (%s)\n",
 +      printk(KERN_INFO "%s: AT91 ethernet at 0x%08x int=%d %s%s (%pM)\n",
               dev->name, (uint) dev->base_addr, dev->irq,
               at91_emac_read(AT91_EMAC_CFG) & AT91_EMAC_SPD ? "100-" : "10-",
               at91_emac_read(AT91_EMAC_CFG) & AT91_EMAC_FD ? "FullDuplex" : "HalfDuplex",
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -468,9 -473,10 +472,9 @@@ static int __devinit dmfe_init_one (str
  
        err = register_netdev (dev);
        if (err)
-               goto err_out_res;
+               goto err_out_free_buf;
  
 -      printk(KERN_INFO "%s: Davicom DM%04lx at pci%s, "
 -             "%s, irq %d.\n",
 +      printk(KERN_INFO "%s: Davicom DM%04lx at pci%s, %pM, irq %d.\n",
               dev->name,
               ent->driver_data >> 16,
               pci_name(pdev),
Simple merge
Simple merge
@@@ -319,7 -319,8 +319,7 @@@ static int p54_parse_eeprom(struct ieee
        void *tmp;
        int err;
        u8 *end = (u8 *)eeprom + len;
-       u16 synth;
+       u16 synth = 0;
 -      DECLARE_MAC_BUF(mac);
  
        wrap = (struct eeprom_pda_wrap *) eeprom;
        entry = (void *)wrap->data + le16_to_cpu(wrap->len);
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge