| commit | e82abaeb7f2a0833fccf90460c48b9f2100258f8 | [log] [tgz] |
|---|---|---|
| author | Stefano Babic <sbabic@denx.de> | Mon Aug 11 10:21:03 2014 +0200 |
| committer | Stefano Babic <sbabic@denx.de> | Mon Aug 11 10:21:03 2014 +0200 |
| tree | de701f5c90b7373966412d566b5c00d3837954bc | |
| parent | f93f21906e374d46c6abfbdf4eb9cb1ab51b6384 [diff] | |
| parent | 1899fac925eda817e12234aef3d01d354788662e [diff] |
Merge branch 'master' of git://git.denx.de/u-boot-arm Conflicts: boards.cfg Signed-off-by: Stefano Babic <sbabic@denx.de>