| commit | 3245e42f1547c7b8a1047564f133490698a9cf9e | [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 | e93f201b474293c16466b65304bbc253d2c4777a [diff] | |
| parent | 6b827bd0f81df56d1d42df5bd8f454fe77f69749 [diff] |
Merge branch 'master' of git://git.denx.de/u-boot-arm Conflicts: boards.cfg Signed-off-by: Stefano Babic <sbabic@denx.de>