summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2011-11-21 09:00:53 -0500
committerJosh Boyer <jwboyer@redhat.com>2011-11-21 09:00:53 -0500
commit43864d3d097e1f1bb305f4bf156d04e57f253078 (patch)
tree6b52974ad71b2ce9a05e60efa5d5cb9b3875c238 /kernel.spec
parent09eae387a11bd63aec4aa08b708422516bd4b6f5 (diff)
downloadkernel-43864d3d097e1f1bb305f4bf156d04e57f253078.tar.gz
kernel-43864d3d097e1f1bb305f4bf156d04e57f253078.tar.xz
kernel-43864d3d097e1f1bb305f4bf156d04e57f253078.zip
Linux 3.2-rc2-git5 (upstream 6fe4c6d466e9)
Disable PM_DEVFREQ as it seems to be embedded (ARM?) specific even though the Kconfig dependencies don't mark it as such any longer.
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec11
1 files changed, 4 insertions, 7 deletions
diff --git a/kernel.spec b/kernel.spec
index 9810071dd..b8cb9a77a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -87,7 +87,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 2
# The git snapshot level
-%define gitrev 4
+%define gitrev 5
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -703,9 +703,6 @@ Patch12303: dmar-disable-when-ricoh-multifunction.patch
Patch13002: revert-efi-rtclock.patch
Patch13003: efi-dont-map-boot-services-on-32bit.patch
-#rhbz 751165
-Patch13010: ip6_tunnel-copy-parms.name-after-register_netdevice.patch
-
Patch20000: utrace.patch
# Flattened devicetree support
@@ -1348,9 +1345,6 @@ ApplyPatch dmar-disable-when-ricoh-multifunction.patch
ApplyPatch revert-efi-rtclock.patch
ApplyPatch efi-dont-map-boot-services-on-32bit.patch
-#rhbz 751165
-ApplyPatch ip6_tunnel-copy-parms.name-after-register_netdevice.patch
-
# utrace.
ApplyPatch utrace.patch
@@ -2106,6 +2100,9 @@ fi
# ||----w |
# || ||
%changelog
+* Mon Nov 21 2011 Josh Boyer <jwboyer@redhat.com> 3.2.0-0.rc2.git5.1
+- Linux 3.2-rc2-git5
+
* Sun Nov 20 2011 Josh Boyer <jwboyer@redhat.com> 3.2.0-0.rc2.git4.1
- Linux 3.2-rc2-git4