[kernel/f16] Disable Intel IOMMU by default.

[Dave Jones]

commit 386df52ea29a88529838d5c95c975a4458926966
Author: Dave Jones <davej at redhat.com>
Date:   Wed Dec 14 20:23:20 2011 -0500

    Disable Intel IOMMU by default.

 config-x86-generic |    2 +-
 kernel.spec        |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/config-x86-generic b/config-x86-generic
index e1d81cf..45fda3b 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -39,7 +39,7 @@ CONFIG_FB_EFI=y
 CONFIG_DMAR=y
 CONFIG_DMAR_BROKEN_GFX_WA=y
 CONFIG_DMAR_FLOPPY_WA=y
-CONFIG_DMAR_DEFAULT_ON=y
+# CONFIG_DMAR_DEFAULT_ON is not set
 CONFIG_SCSI_ADVANSYS=m
 
 CONFIG_SECCOMP=y
diff --git a/kernel.spec b/kernel.spec
index 7ee0504..ce9308e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 3
+%global baserelease 4
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -2208,6 +2208,9 @@ fi
 # and build.
 
 %changelog
+* Thu Dec 15 2011 Dave Jones <davej at redhat.com> - 3.1.5-4
+- Disable Intel IOMMU by default.
+
 * Tue Dec 13 2011 Josh Boyer <jwboyer at redhat.com>
 - Remove extraneous settings and enable Radeon KMS for powerpc (via Will Woods)