Merge branch 'master' of git+ssh://git.debian.org/git/kernel/linux

debian/changelog

@@ -31,6 +31,10 @@ linux (4.6-1~exp2) UNRELEASED; urgency=medium
   * [mips64{,el}] Set CPU to MIPS64 R2.
   * [mips] Set CPU to MIPS32/64 R2.
 
+  [ Martin Michlmayr ]
+  * [armhf] Enable more NVIDIA Tegra options (TEGRA_IOMMU_SMMU,
+    ARM_TEGRA_DEVFREQ, SND_SOC_TEGRA_*).
+
  -- Ben Hutchings <ben@decadent.org.uk>  Tue, 17 May 2016 23:33:30 +0100
 
 linux (4.6-1~exp1) experimental; urgency=medium

debian/config/armhf/config

@@ -206,6 +206,11 @@ CONFIG_CRYPTO_DEV_OMAP_SHAM=m
 CONFIG_CRYPTO_DEV_OMAP_AES=m
 CONFIG_CRYPTO_DEV_SUN4I_SS=m
 
+##
+## file: drivers/devfreq/Kconfig
+##
+CONFIG_ARM_TEGRA_DEVFREQ=m
+
 ##
 ## file: drivers/dma/Kconfig
 ##
@@ -452,6 +457,7 @@ CONFIG_TOUCHSCREEN_SUN4I=m
 CONFIG_OMAP_IOMMU=y
 # CONFIG_OMAP_IOMMU_DEBUG is not set
 CONFIG_ROCKCHIP_IOMMU=y
+CONFIG_TEGRA_IOMMU_SMMU=y
 
 ##
 ## file: drivers/leds/Kconfig
@@ -1220,4 +1226,11 @@ CONFIG_SND_SUN4I_CODEC=m
 ## file: sound/soc/tegra/Kconfig
 ##
 CONFIG_SND_SOC_TEGRA=m
+CONFIG_SND_SOC_TEGRA_RT5640=m
+CONFIG_SND_SOC_TEGRA_WM8753=m
+CONFIG_SND_SOC_TEGRA_WM8903=m
+CONFIG_SND_SOC_TEGRA_TRIMSLICE=m
+CONFIG_SND_SOC_TEGRA_ALC5632=m
+CONFIG_SND_SOC_TEGRA_MAX98090=m
+CONFIG_SND_SOC_TEGRA_RT5677=m