Merge branch 'master' of git://git.denx.de/u-boot-usb
authorTom Rini <trini@konsulko.com>
Mon, 6 Jun 2016 14:04:58 +0000 (10:04 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 6 Jun 2016 17:37:56 +0000 (13:37 -0400)
commitffd859979e2a84bccc14188d9fa760b2e4813515
tree276cb26811a0da6696148e3628d4af36c4c721df
parent1cb9cb3ec0f19b8c54bb01670a530f5bc210d5f3
parent10db7500369ea000af4c4c5b039b7946c2865ae9
Merge branch 'master' of git://git.denx.de/u-boot-usb

Modified:
configs/ls1012afrdm_qspi_defconfig
configs/ls1012aqds_qspi_defconfig
configs/ls1012ardb_qspi_defconfig
include/configs/ls1012afrdm.h
include/configs/ls1012aqds.h
include/configs/ls1012ardb.h

Signed-off-by: Tom Rini <trini@konsulko.com>
12 files changed:
configs/ls1012afrdm_qspi_defconfig
configs/ls1012aqds_qspi_defconfig
configs/ls1012ardb_qspi_defconfig
configs/xilinx_zynqmp_ep_defconfig
configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
configs/xilinx_zynqmp_zcu102_defconfig
configs/xilinx_zynqmp_zcu102_revB_defconfig
include/configs/ls1012afrdm.h
include/configs/ls1012aqds.h
include/configs/ls1012ardb.h
include/configs/xilinx_zynqmp.h