| commit | 02ccab1908c405fe1449457d4a0d343784a30acb | [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 | f40574e2d78c96a3818c4fa2379382d924866a6e [diff] | |
| parent | d883fcc6bbb2fcc3df90857fee99c2f543a0289c [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