| commit | 0872fb2ca887bc230bf2e550818d06d9e631d301 | [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 | fff432077c4fd4e9e72701b3f473c8c0e0e56440 [diff] | |
| parent | 439c6e9a7f3df83555c2ee00ddf5a8b224f072ce [diff] |
Merge git://www.denx.de/git/u-boot-marvell Conflicts: arch/arm/Kconfig Signed-off-by: Tom Rini <trini@konsulko.com>