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

Conflicts:

	drivers/net/wireless/p54/p54common.c

diff --cc MAINTAINERS
Simple merge

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

diff --cc drivers/net/arm/at91_ether.c
index 65ce451ae961f808946173bb40ed293e17c07c05,6f431a887e7e5fb4f2b6ca27217f204a3d063291..e21dc2075ed8d28e03d8f0b1ae3c607f9d95c865
--- 1/drivers/net/arm/at91_ether.c
--- 2/drivers/net/arm/at91_ether.c
+++ b/drivers/net/arm/at91_ether.c
@@@ -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",

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

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

diff --cc drivers/net/ibm_newemac/core.c
Simple merge

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

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

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

diff --cc drivers/net/tulip/dmfe.c
index 194f1825718a613925ecc5b9a125bcdd5fda05f2,c91852f49a48e015cfc6056d337607087263f837..0ec3281529f914098394c36d34253d97c2cd7990
--- 1/drivers/net/tulip/dmfe.c
--- 2/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@@ -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),

diff --cc drivers/net/wireless/iwlwifi/iwl-agn.c
Simple merge

diff --cc drivers/net/wireless/libertas/cmd.c
Simple merge

diff --cc drivers/net/wireless/libertas/scan.c
Simple merge

diff --cc drivers/net/wireless/p54/p54common.c
index 72859decd907cc4908e00daa42af3568c2dc2d8e,827ca0384a4ca220151a048528964ffcbf172ee3..6370c44c64d5eff813d93028c590e44fb6f47a79
--- 1/drivers/net/wireless/p54/p54common.c
--- 2/drivers/net/wireless/p54/p54common.c
+++ b/drivers/net/wireless/p54/p54common.c
@@@ -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);

diff --cc drivers/net/wireless/p54/p54pci.c
Simple merge

diff --cc drivers/s390/net/qeth_l2_main.c
Simple merge

diff --cc include/linux/kernel.h
Simple merge

diff --cc include/net/sock.h
Simple merge

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

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

diff --cc net/ipv4/cipso_ipv4.c
Simple merge

diff --cc net/netlabel/netlabel_addrlist.c
Simple merge

diff --cc net/sunrpc/xprtsock.c
Simple merge

diff --cc net/xfrm/xfrm_policy.c
Simple merge