| commit | 52a0551106d6823151b43dd94843c74937430b1e | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@konsulko.com> | Sat Jun 18 23:46:21 2016 -0400 |
| committer | Tom Rini <trini@konsulko.com> | Sat Jun 18 23:46:21 2016 -0400 |
| tree | 4fa6eff1efde896343c455854b5c78b2b91bd9e9 | |
| parent | 998696754cbc0e2ca439d87036319be1e3fbe27a [diff] | |
| parent | ba397ba078cd96094a53339390585aa560c07044 [diff] |
Merge branch 'master' of git://git.denx.de/u-boot-usb Signed-off-by: Tom Rini <trini@konsulko.com> Conflicts: arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h