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

Conflicts:

	board/eukrea/cpu9260/cpu9260.c
	drivers/serial/serial_s5pc1xx.c
	include/asm-arm/arch-s5pc1xx/clock.h
	include/asm-arm/arch-s5pc1xx/gpio.h
	include/asm-arm/arch-s5pc1xx/pwm.h
	include/asm-arm/arch-s5pc1xx/uart.h
	include/configs/cpu9260.h
	include/configs/cpuat91.h
	include/configs/davinci_dm355evm.h
	include/linux/mtd/samsung_onenand.h

diff --combined drivers/net/smc911x.c
index b106ec97320a17c530650aa8bcafb6e6df626369,df7347897b125412b734243981bfea716934f71e..48e08c06c9c13a6a74220852a4303c8422261d8f
--- 1/drivers/net/smc911x.c
--- 2/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@@ -249,6 -249,12 +249,12 @@@ int smc911x_initialize(u8 dev_num, int 
  
        dev->iobase = base_addr;
  
+       /* Try to detect chip. Will fail if not present. */
+       if (smc911x_detect_chip(dev)) {
+               free(dev);
+               return 0;
+       }
+ 
        addrh = smc911x_get_mac_csr(dev, ADDRH);
        addrl = smc911x_get_mac_csr(dev, ADDRL);
        dev->enetaddr[0] = addrl;
@@@ -264,12 -270,6 +270,12 @@@
        dev->recv = smc911x_rx;
        sprintf(dev->name, "%s-%hu", DRIVERNAME, dev_num);
  
 +      /* Try to detect chip. Will fail if not present. */
 +      if (smc911x_detect_chip(dev)) {
 +              free(dev);
 +              return 0;
 +      }
 +
        eth_register(dev);
        return 0;
  }