Merge branch 'master' of git://www.denx.de/git/u-boot-imx

diff --cc arch/arm/Kconfig
Simple merge

diff --cc drivers/usb/Kconfig
Simple merge

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

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

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

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

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