| commit | 40d97bd0bf4e4f1a63fcb9ffd6d40a8a8f3be800 | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@konsulko.com> | Sun Mar 19 14:49:26 2017 -0400 |
| committer | Tom Rini <trini@konsulko.com> | Sun Mar 19 15:13:38 2017 -0400 |
| tree | 3a5d41abff96a3af22587ace67713d5c0165b097 | |
| parent | 29c8bc06c6d2097a770bd332cf557dfd8783e621 [diff] | |
| parent | bd1c99c138deead235fa9124f4b76daf495c3872 [diff] |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx Signed-off-by: Tom Rini <trini@konsulko.com> Conflicts: configs/bk4r1_defconfig configs/colibri_vf_defconfig configs/pcm052_defconfig include/configs/colibri_vf.h include/configs/pcm052.h