| commit | f46c25583a73042edf432b209ee4b93bc3f7e762 | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@konsulko.com> | Thu Jan 14 11:23:05 2016 -0500 |
| committer | Tom Rini <trini@konsulko.com> | Thu Jan 14 11:23:05 2016 -0500 |
| tree | a7cbd8afde1b0cbf86a9c8150cbd737df3ee82c9 | |
| parent | db18f548cb7b5ff99223b66eac1966eb45230817 [diff] | |
| parent | f822d8578ba395d9af1cc315a2fb87b1eed3d355 [diff] |
Merge git://www.denx.de/git/u-boot-marvell Conflicts: arch/arm/Kconfig Signed-off-by: Tom Rini <trini@konsulko.com>