]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
projects / people / ms / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4f7136e b684115)
Merge branch 'master' of git://git.denx.de/u-boot-net
authorWolfgang Denk <wd@denx.de>
Fri, 20 Jul 2012 06:55:38 +0000 (08:55 +0200)
committerWolfgang Denk <wd@denx.de>
Fri, 20 Jul 2012 06:55:38 +0000 (08:55 +0200)
* '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>

Trivial merge
"Das U-Boot" Source Tree