diff options
| author | Chuck Ebbert <cebbert@redhat.com> | 2010-09-11 09:51:06 -0400 |
|---|---|---|
| committer | Chuck Ebbert <cebbert@redhat.com> | 2010-09-11 09:51:06 -0400 |
| commit | 2c454f2cf7b5d0e44ef175c73c270a7f943fdad4 (patch) | |
| tree | c6cb506972bd1433d35ac6f7490f83c651283288 /kernel.spec | |
| parent | 78100db1fe80f5d95fb53bd9300fca6a22b77911 (diff) | |
| download | kernel-2c454f2cf7b5d0e44ef175c73c270a7f943fdad4.tar.gz kernel-2c454f2cf7b5d0e44ef175c73c270a7f943fdad4.tar.xz kernel-2c454f2cf7b5d0e44ef175c73c270a7f943fdad4.zip | |
Linux 2.6.36-rc3-git4
Drop revert-drm-i915-enable-rc6-on-ironlake.patch, now merged
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/kernel.spec b/kernel.spec index bbde1e8c1..db07f4a19 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@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@redhat.com> - 2.6.36-0.19.rc3.git1 - Update AppleIR patch to work, and support the enter key on newer remotes |