Commits
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
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