| commit | a7938d10504bf8c2725939e853470902470640fd | [log] [tgz] |
|---|---|---|
| author | Wolfgang Denk <wd@denx.de> | Fri Jul 20 08:55:38 2012 +0200 |
| committer | Wolfgang Denk <wd@denx.de> | Fri Jul 20 08:55:38 2012 +0200 |
| tree | 2a7755ac48bea29197fde15e462dd3569688f991 | |
| parent | 92e144f70c22a902402d3922cacaea7a77d3c5b2 [diff] | |
| parent | 4f2abfb90e7b6ecaa313591b9d16fd18d75ce9a7 [diff] |
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>