| commit | 047cc04eefc8ec24bd64e5531625f6cbdb4cbe10 | [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 | b6936d75740bfbe7c2e934208bdcf44e0db34411 [diff] | |
| parent | 17b6bf1e5f09509a141112e4807997d153d640e3 [diff] |
Merge branch 'master' of git://git.denx.de/u-boot Signed-off-by: Stefano Babic <sbabic@denx.de> Conflicts: boards.cfg