Merge branch 'master' of git://git.denx.de/u-boot-usb
authorTom Rini <trini@konsulko.com>
Sun, 19 Jun 2016 03:46:21 +0000 (23:46 -0400)
committerTom Rini <trini@konsulko.com>
Sun, 19 Jun 2016 03:46:21 +0000 (23:46 -0400)
commita10a31ec91ad2ee514a42baea9314553aa972676
tree4fa6eff1efde896343c455854b5c78b2b91bd9e9
parent2372b0012925f9100980151f4a28347c82feaba8
parent1e6fb0e367564d427d7c57fa7b3b972ecb7147a3
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
arch/arm/cpu/armv8/fsl-layerscape/cpu.c
arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h
board/freescale/ls2080aqds/ls2080aqds.c