| commit | a10a31ec91ad2ee514a42baea9314553aa972676 | [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 | 2372b0012925f9100980151f4a28347c82feaba8 [diff] | |
| parent | 1e6fb0e367564d427d7c57fa7b3b972ecb7147a3 [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