]> git.sur5r.net Git - u-boot/commitdiff
projects / u-boot / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f413d1c 4c04371)
Merge branch 'master' of git://git.denx.de/u-boot-usb
authorTom Rini <trini@konsulko.com>
Sat, 1 Oct 2016 01:58:44 +0000 (21:58 -0400)
committerTom Rini <trini@konsulko.com>
Sat, 1 Oct 2016 01:58:44 +0000 (21:58 -0400)
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
include/configs/dra7xx_evm.h

1  2 
configs/colibri_vf_defconfig patch | diff1 | diff2 | blob | history
drivers/usb/common/fsl-errata.c patch | diff1 | diff2 | blob | history
include/configs/colibri_imx7.h patch | diff1 | diff2 | blob | history
include/configs/dra7xx_evm.h patch | diff1 | diff2 | blob | history

diff --cc configs/colibri_vf_defconfig
Simple merge
diff --cc drivers/usb/common/fsl-errata.c
Simple merge
diff --cc include/configs/colibri_imx7.h
Simple merge
diff --cc include/configs/dra7xx_evm.h
Simple merge
Cloned from git://git.denx.de/u-boot.git