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

* 'master' of git://git.denx.de/u-boot-avr32:
  net:macb: add line break
  avr32:portmux: fix setup for macb1
  avr32: Remove redundant LDSCRIPT definition

Signed-off-by: Wolfgang Denk <wd@denx.de>

diff --combined drivers/net/macb.c
index 8f55cdc05f5443c5231e79eecfa104d647952045,ba172775f561c23125ca7106faadc3ff291cdf23..0e1ced71c507441d1d2101b3b35e979bba6a4414
--- 1/drivers/net/macb.c
--- 2/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@@ -364,7 -364,7 +364,7 @@@ static int macb_phy_find(struct macb_de
        }
  
        /* PHY isn't up to snuff */
-       printf("%s: PHY not found", macb->netdev.name);
+       printf("%s: PHY not found\n", macb->netdev.name);
  
        return 0;
  }
@@@ -471,7 -471,7 +471,7 @@@ static int macb_init(struct eth_device 
  #if   defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \
        defined(CONFIG_AT91SAM9263) || defined(CONFIG_AT91SAM9G20) || \
        defined(CONFIG_AT91SAM9G45) || defined(CONFIG_AT91SAM9M10G45) || \
 -      defined(CONFIG_AT91SAM9XE)
 +      defined(CONFIG_AT91SAM9XE) || defined(CONFIG_AT91SAM9X5)
        macb_writel(macb, USRIO, MACB_BIT(RMII) | MACB_BIT(CLKEN));
  #else
        macb_writel(macb, USRIO, 0);
@@@ -480,7 -480,7 +480,7 @@@
  #if   defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \
        defined(CONFIG_AT91SAM9263) || defined(CONFIG_AT91SAM9G20) || \
        defined(CONFIG_AT91SAM9G45) || defined(CONFIG_AT91SAM9M10G45) || \
 -      defined(CONFIG_AT91SAM9XE)
 +      defined(CONFIG_AT91SAM9XE) || defined(CONFIG_AT91SAM9X5)
        macb_writel(macb, USRIO, MACB_BIT(CLKEN));
  #else
        macb_writel(macb, USRIO, MACB_BIT(MII));