Merge branch 'master' of git://git.denx.de/u-boot-net

diff --cc board/freescale/ls1021atwr/ls1021atwr.c
Simple merge

diff --cc cmd/ethsw.c
Simple merge

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

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

diff --cc drivers/net/phy/cortina.c
Simple merge

diff --cc drivers/net/tsec.c
index 9b09caf,025e7a7..be0f382
--- 1/drivers/net/tsec.c
--- 2/drivers/net/tsec.c
+++ b/drivers/net/tsec.c
@@@ -630,11 -707,13 +707,13 @@@ static int tsec_initialize(bd_t *bis, s
        priv->phyregs_sgmii = tsec_info->miiregs_sgmii;
  
        priv->phyaddr = tsec_info->phyaddr;
+       priv->tbiaddr = CONFIG_SYS_TBIPA_VALUE;
        priv->flags = tsec_info->flags;
  
 -      sprintf(dev->name, tsec_info->devname);
 +      strcpy(dev->name, tsec_info->devname);
        priv->interface = tsec_info->interface;
        priv->bus = miiphy_get_dev_by_name(tsec_info->mii_devname);
+       priv->dev = dev;
        dev->iobase = 0;
        dev->priv = priv;
        dev->init = tsec_init;

diff --cc include/net.h
Simple merge