Merge remote-tracking branch 'tegra/for-next'

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Kconfig.debug
Simple merge

diff --cc drivers/crypto/tegra-aes.c
Simple merge