| commit | 4f892924d238cc415891dbea336a0fdaff2f853b | [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 | ec1eaad06551e2422baf8743f6987d4f561f2ce6 [diff] | |
| parent | 1c140f7bbf4a008fcd78b407ea80c60a2a18fc1f [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