tree 6120e2d0923962ec16cc757a22454bc942c90af4
parent 8bf9908d5fcabc94d8cb0f218e0ee261f9fc20bc
parent 6c98ff8bbb686ba0220be3ee40321ab1472d8e31
author Tom Rini <trini@konsulko.com> 1501685546 -0400
committer Tom Rini <trini@konsulko.com> 1501685546 -0400

Merge git://git.denx.de/u-boot-fsl-qoriq

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

Conflicts:
	include/configs/ls1046aqds.h
	include/configs/ls1046ardb.h