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

Conflicts:
	drivers/net/ucc_geth.c

diff --cc drivers/net/Kconfig
Simple merge

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

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

diff --cc drivers/net/ucc_geth.c
index 1c095c6,1f61e42..8f0ac44
--- 1/drivers/net/ucc_geth.c
--- 2/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@@ -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 */

diff --cc drivers/net/ucc_geth.h
Simple merge

diff --cc net/wireless/nl80211.c
Simple merge