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

diff --cc README
Simple merge

diff --cc drivers/net/dm9000x.c
index c2144d9,68901cd..fa95a73
--- 1/drivers/net/dm9000x.c
--- 2/drivers/net/dm9000x.c
+++ b/drivers/net/dm9000x.c
@@@ -456,26 -289,21 +456,28 @@@ eth_init(bd_t * bd
        /* Set PHY */
        set_PHY_mode();
  
 -      /* Program operating register */
 -      DM9000_iow(DM9000_NCR, 0x0);    /* only intern phy supported by now */
 -      DM9000_iow(DM9000_TCR, 0);      /* TX Polling clear */
 -      DM9000_iow(DM9000_BPTR, 0x3f);  /* Less 3Kb, 200us */
 -      DM9000_iow(DM9000_FCTR, FCTR_HWOT(3) | FCTR_LWOT(8));   /* Flow Control : High/Low Water */
 -      DM9000_iow(DM9000_FCR, 0x0);    /* SH FIXME: This looks strange! Flow Control */
 -      DM9000_iow(DM9000_SMCR, 0);     /* Special Mode */
 -      DM9000_iow(DM9000_NSR, NSR_WAKEST | NSR_TX2END | NSR_TX1END);   /* clear TX status */
 -      DM9000_iow(DM9000_ISR, 0x0f);   /* Clear interrupt status */
 +      /* Program operating register, only intern phy supported by now */
 +      DM9000_iow(DM9000_NCR, 0x0);
 +      /* TX Polling clear */
 +      DM9000_iow(DM9000_TCR, 0);
 +      /* Less 3Kb, 200us */
 +      DM9000_iow(DM9000_BPTR, 0x3f);
 +      /* Flow Control : High/Low Water */
 +      DM9000_iow(DM9000_FCTR, FCTR_HWOT(3) | FCTR_LWOT(8));
 +      /* SH FIXME: This looks strange! Flow Control */
 +      DM9000_iow(DM9000_FCR, 0x0);
 +      /* Special Mode */
 +      DM9000_iow(DM9000_SMCR, 0);
 +      /* clear TX status */
 +      DM9000_iow(DM9000_NSR, NSR_WAKEST | NSR_TX2END | NSR_TX1END);
 +      /* Clear interrupt status */
 +      DM9000_iow(DM9000_ISR, 0x0f);
  
        /* Set Node address */
+ #ifndef CONFIG_AT91SAM9261EK
        for (i = 0; i < 6; i++)
                ((u16 *) bd->bi_enetaddr)[i] = read_srom_word(i);
+ #endif
  
        if (is_zero_ether_addr(bd->bi_enetaddr) ||
            is_multicast_ether_addr(bd->bi_enetaddr)) {