Merge branch 'master' of git://git.denx.de/u-boot-avr32
authorWolfgang Denk <wd@denx.de>
Tue, 4 Sep 2012 07:17:27 +0000 (09:17 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 4 Sep 2012 07:17:27 +0000 (09:17 +0200)
commita6f0c4faa4c65a7b7048b12c9d180d7e1aad1721
tree5fec0565eef6900dcf99c62e3b5e6fb108508ae6
parent48efe65829102fe7936304c0ed96b3935800f40a
parent6ed0e940713d417f24fbc67898cea6f6ece4a0e1
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>
drivers/net/macb.c