[kernel/f17] Disable UDL DRM driver per Dave Airlie

[Josh Boyer]

commit da5989677543fd40e6743a3f406c47c82347b8f7
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Fri Jun 22 07:47:04 2012 -0400

    Disable UDL DRM driver per Dave Airlie

 config-generic |    2 +-
 kernel.spec    |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/config-generic b/config-generic
index 35146b8..6f71a52 100644
--- a/config-generic
+++ b/config-generic
@@ -2446,7 +2446,7 @@ CONFIG_DRM_NOUVEAU_DEBUG=y
 # CONFIG_DRM_PSB is not set
 CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_SIL164=m
-CONFIG_DRM_UDL=m
+# CONFIG_DRM_UDL is not set
 CONFIG_DRM_VMWGFX=m
 CONFIG_DRM_VGEM=m
 
diff --git a/kernel.spec b/kernel.spec
index 88c5e45..a2131da 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
@@ -2366,6 +2366,9 @@ fi
 #    '-'      |  |
 #              '-'
 %changelog
+* Fri Jun 22 2012 Josh Boyer <jwboyer at redhat.com>
+- Disable UDL DRM driver per Dave Airlie
+
 * Wed Jun 20 2012 Josh Boyer <jwboyer at redhat.com>
 - Fix incorrect logic in irqpoll patch