From: Wolfgang Denk <wd@denx.de>
Date: Fri, 20 Jul 2012 06:55:38 +0000 (+0200)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-net
X-Git-Tag: v2025.01-rc5-pxa1908~17673^2~53
X-Git-Url: http://git.dujemihanovic.xyz/html/%7B%7B%20.RelPermalink%20%7D%7D?a=commitdiff_plain;h=062cf36f674db38d1ce27addfdcb5b3a6160b362;p=u-boot.git

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

* 'master' of git://git.denx.de/u-boot-net:
  net: link_local: fix build
  net: bootp: fix build

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

062cf36f674db38d1ce27addfdcb5b3a6160b362