| commit | 972b4599779ffe6f82e0987c1f0884178980d1d7 | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@konsulko.com> | Fri Nov 25 17:39:54 2016 -0500 |
| committer | Tom Rini <trini@konsulko.com> | Fri Nov 25 17:39:54 2016 -0500 |
| tree | 0d3cf0fd0e45bf10c7897a24f3560589f7740e20 | |
| parent | 15fc272156509bf604fd64fe676b45340dd9af36 [diff] | |
| parent | 48cd6abc6f1961fbc70888fbefe60edfe807fdd3 [diff] |
Merge git://git.denx.de/u-boot-fsl-qoriq Signed-off-by: Tom Rini <trini@konsulko.com> Conflicts: arch/arm/Kconfig