Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Mon, 23 Mar 2009 20:35:04 +0000 (13:35 -0700)]
Conflicts:
drivers/net/ucc_geth.c

1  2 
drivers/net/Kconfig
drivers/net/dnet.c
drivers/net/sungem.c
drivers/net/ucc_geth.c
drivers/net/ucc_geth.h
net/wireless/nl80211.c

Simple merge
Simple merge
Simple merge
@@@ -3657,8 -3641,9 +3641,14 @@@ static int ucc_geth_probe(struct of_dev
                if (err)
                        return -1;
  
++<<<<<<< HEAD:drivers/net/ucc_geth.c
 +              snprintf(ug_info->mdio_bus, MII_BUS_ID_SIZE, "%x",
 +                              res.start&0xfffff);
++=======
+               uec_mdio_bus_name(bus_name, mdio);
+               snprintf(ug_info->phy_bus_id, sizeof(ug_info->phy_bus_id),
+                       "%s:%02x", bus_name, *prop);
++>>>>>>> 61fa9dcf9329cb92c220f7b656410fbe5e72f933:drivers/net/ucc_geth.c
        }
  
        /* get the phy interface type, or default to MII */
Simple merge
Simple merge