diff --git a/config-armv7 b/config-armv7
index 61699e448..727b3fbca 100644
--- a/config-armv7
+++ b/config-armv7
@@ -406,7 +406,7 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=m
 CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=m
 CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=m
 # CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set
-CONFIG_CRYPTO_DEV_MXS_DCP=m
+# CONFIG_CRYPTO_DEV_MXS_DCP is not set
 CONFIG_RTC_DRV_SNVS=m
 CONFIG_FB_MXS=m
 # CONFIG_FB_MX3 is not set
diff --git a/config-armv7-generic b/config-armv7-generic
index 60866f873..db080c2e0 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -247,7 +247,7 @@ CONFIG_EXYNOS_ADC=m
 CONFIG_MMC_SDHCI_S3C=m
 CONFIG_MMC_SDHCI_S3C_DMA=y
 CONFIG_MMC_DW_EXYNOS=m
-CONFIG_EXYNOS_IOMMU=y
+# CONFIG_EXYNOS_IOMMU is not set
 CONFIG_PCI_EXYNOS=y
 CONFIG_PHY_EXYNOS5_USBDRD=m
 CONFIG_PHY_SAMSUNG_USB2=m
@@ -283,7 +283,7 @@ CONFIG_DRM_EXYNOS7_DECON=y
 CONFIG_DRM_EXYNOS_G2D=y
 CONFIG_DRM_EXYNOS_GSC=y
 CONFIG_DRM_EXYNOS_HDMI=y
-CONFIG_DRM_EXYNOS_IOMMU=y
+# CONFIG_DRM_EXYNOS_IOMMU is not set
 CONFIG_DRM_EXYNOS_IPP=y
 CONFIG_DRM_EXYNOS_ROTATOR=y
 CONFIG_DRM_EXYNOS_VIDI=y
diff --git a/kernel.spec b/kernel.spec
index 0dbc1cb8f..dfc0eb6c7 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2036,6 +2036,10 @@ fi
 #
 # 
 %changelog
+* Thu Nov  5 2015 Peter Robinson <pbrobinson@fedoraproject.org>
+- Disable Exynos IOMMU as it crashes
+- Minor ARMv7 update
+
 * Thu Nov 05 2015 Laura Abbott <labbott@redhat.com> - 4.4.0-0.rc0.git3.1
 - Linux v4.3-6681-g8e483ed