Merge branch 'master' of git://git.denx.de/u-boot-avr32
authorWolfgang Denk <wd@denx.de>
Thu, 7 Jun 2012 21:41:03 +0000 (23:41 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 7 Jun 2012 21:41:03 +0000 (23:41 +0200)
commit74b5b5dbc3345a8fad4bc798f8f88d07d2ef0008
tree474bc1734337eea4ffe7a5d64a4102185d7c0b42
parentd1c6e9e44a7218b390962e90ed462a134564676f
parentd3a105a26f89ba9f43800f9452907e01b8211da5
Merge branch 'master' of git://git.denx.de/u-boot-avr32

* 'master' of git://git.denx.de/u-boot-avr32:
  avr32:board.c: fix compile warning
  avr32:grasshopper: fix PHY initialisation

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