From: Wolfgang Denk <wd@denx.de> Date: Tue, 4 Sep 2012 07:17:27 +0000 (+0200) Subject: Merge branch 'master' of git://git.denx.de/u-boot-avr32 X-Git-Tag: v2025.01-rc5-pxa1908~17314 X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=a6f0c4faa4c65a7b7048b12c9d180d7e1aad1721;p=u-boot.git 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> --- a6f0c4faa4c65a7b7048b12c9d180d7e1aad1721