tree 276cb26811a0da6696148e3628d4af36c4c721df
parent 6ef13a927a073489a6556f68598758e18a46d2df
parent d3b72cab329d187b6afcabfe94c599ea4b4bbfce
author Tom Rini <trini@konsulko.com> 1465221898 -0400
committer Tom Rini <trini@konsulko.com> 1465234676 -0400

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>