| commit | 753b34545ebfc7228a89964d72f87c1f634a4b2e | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@konsulko.com> | Fri Oct 28 11:12:03 2016 -0400 |
| committer | Tom Rini <trini@konsulko.com> | Fri Oct 28 11:12:03 2016 -0400 |
| tree | 145882227f01a5092c656d1fc7122adff76bc8c2 | |
| parent | 1d41f3cbcb1fccf2fd81ae5409c96fa03f69dd3d [diff] | |
| parent | 302924b4fa3e136205ec4541cf8d39a9d285985a [diff] |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx Signed-off-by: Tom Rini <trini@konsulko.com> Conflicts: common/Kconfig configs/dms-ba16_defconfig