Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'

arch/arm/dts/tegra114.dtsi

arch/arm/include/asm/arch-tegra/board.h

arch/arm/include/asm/arch-tegra114/gp_padctrl.h

arch/arm/include/asm/arch-tegra114/tegra114_spi.h

arch/arm/include/asm/arch-tegra20/tegra20_sflash.h

arch/arm/include/asm/arch-tegra20/tegra20_slink.h

board/nvidia/common/board.c

board/nvidia/common/common.mk

board/nvidia/common/uart-spi-switch.c

board/nvidia/dalmore/dalmore.c

board/nvidia/dalmore/pinmux-config-dalmore.h

board/nvidia/dts/tegra114-dalmore.dts

board/nvidia/seaboard/seaboard.c

drivers/mtd/spi/winbond.c

drivers/spi/Makefile

drivers/spi/fdt_spi.c

drivers/spi/tegra114_spi.c

drivers/spi/tegra20_sflash.c

drivers/spi/tegra20_slink.c

include/configs/cardhu.h