summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2011-12-17 08:58:46 -0500
committerJosh Boyer <jwboyer@redhat.com>2011-12-17 09:02:41 -0500
commit799841bbdd0d8dc24c267c8cd13159c614ef871b (patch)
treef653508ed84ab9b11840d8fd69fc67eeb4dd65cc /kernel.spec
parente7b5dbf08a15d9de0cf53eec3992ba7d553b8a8e (diff)
downloadkernel-799841bbdd0d8dc24c267c8cd13159c614ef871b.tar.gz
kernel-799841bbdd0d8dc24c267c8cd13159c614ef871b.tar.xz
kernel-799841bbdd0d8dc24c267c8cd13159c614ef871b.zip
Linux 3.2-rc6
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec10
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel.spec b/kernel.spec
index 2c3a74a35..6c4b085e4 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -85,9 +85,9 @@ Summary: The Linux kernel
# The next upstream release sublevel (base_sublevel+1)
%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
# The rc snapshot level
-%define rcrev 5
+%define rcrev 6
# The git snapshot level
-%define gitrev 4
+%define gitrev 0
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -681,8 +681,6 @@ Patch1700: drm-edid-try-harder-to-fix-up-broken-headers.patch
# nouveau + drm fixes
# intel drm is all merged upstream
Patch1824: drm-intel-next.patch
-# rhbz#729882, https://bugs.freedesktop.org/attachment.cgi?id=49069
-Patch1826: drm-i915-sdvo-lvds-is-digital.patch
Patch1900: linux-2.6-intel-iommu-igfx.patch
@@ -1368,7 +1366,6 @@ ApplyPatch drm-edid-try-harder-to-fix-up-broken-headers.patch
# Intel DRM
ApplyOptionalPatch drm-intel-next.patch
-ApplyPatch drm-i915-sdvo-lvds-is-digital.patch
ApplyPatch linux-2.6-intel-iommu-igfx.patch
@@ -2233,6 +2230,9 @@ fi
# ||----w |
# || ||
%changelog
+* Sat Dec 17 2011 Josh Boyer <jwboyer@redhat.com> - 3.2.0-0.rc6.git0.1
+- Linux 3.2-rc6
+
* Fri Dec 16 2011 Dave Jones <davej@redhat.com> - 3.2.0-0.rc5.git4.1
- Linux 3.2-rc5-git4 (6f12d2ee52dcf97dcefdadbd500e7650311eaa6a)