From: David S. Miller <davem@davemloft.net>
Date: Mon, 23 Mar 2009 20:35:04 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8be7cdccacfbfc707e7370cad9bb168defed636f;p=linux-2.6-omap-h63xx.git

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

Conflicts:
	drivers/net/ucc_geth.c
---

8be7cdccacfbfc707e7370cad9bb168defed636f
diff --cc drivers/net/ucc_geth.c
index 1c095c63f98,1f61e42c641..8f0ac442c90
--- a/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 */