[kernel/f15] Disable Intel IOMMU by default.

[Dave Jones]

commit 94f063e126f0b9f5ce6281def10781c0a1966ad7
Author: Dave Jones <davej at redhat.com>
Date:   Wed Dec 14 20:23:59 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 4252062..23aecbb 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 3241598..77c3d3b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -42,7 +42,7 @@ Summary: The Linux kernel
 # When changing real_sublevel below, reset this by hand to 1
 # (or to 0 and then use rpmdev-bumpspec).
 #
-%global baserelease 2
+%global baserelease 3
 %global fedora_build %{baserelease}
 
 # real_sublevel is the 3.x kernel version we're starting with
@@ -1959,6 +1959,9 @@ fi
 # and build.
 
 %changelog
+* Thu Dec 15 2011 Dave Jones <davej at redhat.com> - 2.6.41.5-3
+- Disable Intel IOMMU by default.
+
 * Fri Dec 09 2011 Josh Boyer <jwboyer at redhat.com> 2.6.41.5-1
 - Linux 3.1.5 (Fedora 2.6.41.5)