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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
index ebb9941fb42d4fac2c951e91323070f070a18a66,2dec6ec0533321306c1a91bad9938bf838ce650d..d275c5f04c3531fc14a100272e27a2dc154f5613
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -675,8 -683,10 +675,9 @@@ config ARCH_TEGR
        select HAVE_CLK
        select HAVE_SMP
        select MIGHT_HAVE_CACHE_L2X0
 -      select NEED_MACH_IO_H if PCI
        select ARCH_HAS_CPUFREQ
        select USE_OF
+       select COMMON_CLK
        help
          This enables support for NVIDIA Tegra based systems (Tegra APX,
          Tegra 6xx and Tegra 2 series).

diff --cc drivers/mmc/host/sdhci-tegra.c
Simple merge