[kernel] Linux 2.6.36-rc3-git4

[Chuck Ebbert]

commit 2c454f2cf7b5d0e44ef175c73c270a7f943fdad4
Author: Chuck Ebbert <cebbert at redhat.com>
Date:   Sat Sep 11 09:51:06 2010 -0400

    Linux 2.6.36-rc3-git4
    
    Drop revert-drm-i915-enable-rc6-on-ironlake.patch, now merged

 .gitignore                                   |    2 -
 kernel.spec                                  |   10 ++++--
 revert-drm-i915-enable-rc6-on-ironlake.patch |   41 --------------------------
 sources                                      |    2 +-
 4 files changed, 7 insertions(+), 48 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3b324dc..c2fd413 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,5 +3,3 @@ patch-*.bz2
 clog
 *.rpm
 kernel-2.6.*/
-/patch-2.6.36-rc3.bz2
-/patch-2.6.36-rc3-git1.bz2
diff --git a/kernel.spec b/kernel.spec
index bbde1e8..db07f4a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -51,7 +51,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be prepended with "0.", so
 # for example a 3 here will become 0.3
 #
-%global baserelease 19
+%global baserelease 20
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -84,7 +84,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 3
 # The git snapshot level
-%define gitrev 1
+%define gitrev 4
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -659,7 +659,6 @@ Patch1824: drm-intel-next.patch
 # make sure the lvds comes back on lid open
 Patch1825: drm-intel-make-lvds-work.patch
 Patch1900: linux-2.6-intel-iommu-igfx.patch
-Patch1901: revert-drm-i915-enable-rc6-on-ironlake.patch
 
 # linux1394 git patches
 Patch2200: linux-2.6-firewire-git-update.patch
@@ -1243,7 +1242,6 @@ ApplyPatch drm-intel-big-hammer.patch
 ApplyOptionalPatch drm-intel-next.patch
 ApplyPatch drm-intel-make-lvds-work.patch
 ApplyPatch linux-2.6-intel-iommu-igfx.patch
-ApplyPatch revert-drm-i915-enable-rc6-on-ironlake.patch
 
 # linux1394 git patches
 #ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1884,6 +1882,10 @@ fi
 #                 ||     ||
 
 %changelog
+* Sat Sep 11 2010 Chuck Ebbert <cebbert at redhat.com> - 2.6.36-0.20.rc3.git4
+- Linux 2.6.36-rc3-git4
+- Drop revert-drm-i915-enable-rc6-on-ironlake.patch, now merged
+
 * Fri Sep 10 2010 Bastien Nocera <bnocera at redhat.com> - 2.6.36-0.19.rc3.git1
 - Update AppleIR patch to work, and support the enter key on
   newer remotes
diff --git a/sources b/sources
index 7026bb8..b7d4333 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 091abeb4684ce03d1d936851618687b6  linux-2.6.35.tar.bz2
 94696d0d72fc9a9e70dd10f40d39c573  patch-2.6.36-rc3.bz2
-517a061b696c1146038487e180204066  patch-2.6.36-rc3-git1.bz2
+6c9b5329e128d5f985a6ce9624e491c5  patch-2.6.36-rc3-git4.bz2