| commit | dab5e3469d294a4e1ffed8407d296a78e02cc01f | [log] [tgz] |
|---|---|---|
| author | Stefano Babic <sbabic@denx.de> | Wed Jul 16 08:51:30 2014 +0200 |
| committer | Stefano Babic <sbabic@denx.de> | Wed Jul 16 08:51:30 2014 +0200 |
| tree | c6378034591210b3142ca3add806d52c6ea22b3b | |
| parent | 14a1613140519a8d0a88e6054c302a8cb3e067a5 [diff] | |
| parent | 524123a70761110c5cf3ccc5f52f6d4da071b959 [diff] |
Merge branch 'master' of git://git.denx.de/u-boot Signed-off-by: Stefano Babic <sbabic@denx.de> Conflicts: boards.cfg