Tom Rini fe4ba689a0 Merge branch 'master' of git://git.denx.de/u-boot-usb ...

Signed-off-by: Tom Rini <trini@konsulko.com>

Conflicts:
	include/configs/dra7xx_evm.h

2016-09-30 21:58:44 -04:00

..

common.c

…

fsl-dt-fixup.c

…

fsl-errata.c

Merge branch 'master' of git://git.denx.de/u-boot-usb

2016-09-30 21:58:44 -04:00

Makefile

…