Merge remote-tracking branch 'u-boot-imx/master'

diff --cc include/configs/mx51evk.h
Simple merge

diff --cc include/configs/mx53evk.h
Simple merge

diff --cc include/configs/mx53loco.h
Simple merge

diff --cc include/configs/mx6qarm2.h
Simple merge

diff --cc include/configs/mx6qsabrelite.h
Simple merge