| commit | f7cf32299b9aecc7ae0a25685d3990abdcd92c1a | [log] [tgz] |
|---|---|---|
| author | Stefano Babic <sbabic@denx.de> | Fri Sep 13 12:04:54 2013 +0200 |
| committer | Stefano Babic <sbabic@denx.de> | Fri Sep 13 12:10:07 2013 +0200 |
| tree | 06342cd9b8cc41b95442a992fb38a1bc8671b05c | |
| parent | 978528978cb67adeca7c3dd302fb2efc9590c681 [diff] | |
| parent | c98fedaa1aa79dbae765e784efe7795f4bd33383 [diff] |
Merge branch 'master' of git://git.denx.de/u-boot-arm Conflicts: MAINTAINERS boards.cfg Signed-off-by: Stefano Babic <sbabic@denx.de>