Merge branch 'tegra/cleanup' into next/cleanup

diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/mm/dma-mapping.c
Simple merge
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/dma-mapping.c	patch \|	diff1 \|	diff2 \|	blob \| history