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

diff --cc arch/arm/Kconfig
index 7a7b2e32a3b1ab5ddd6433ea12f69945fb42a007,35a0e5fa40970e48808ca10fb338c13af50523a8..33c22d9da82c1b213a69b8d6576911649c28e14b
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -676,8 -689,10 +676,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/i2c/busses/i2c-tegra.c
Simple merge