tree 5fec0565eef6900dcf99c62e3b5e6fb108508ae6
parent be2f35fba70f9e7f2ba0a867ac5d5be8bb7cf28e
parent 7b2159a7e73b359c15009714d57eae95a59e8920
author Wolfgang Denk <wd@denx.de> 1346743047 +0200
committer Wolfgang Denk <wd@denx.de> 1346743047 +0200

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>