summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2012-08-02 10:52:32 -0400
committerJosh Boyer <jwboyer@redhat.com>2012-08-02 10:52:32 -0400
commit7eb10928fe13e4b6418e61914e569b1f4263fe89 (patch)
tree79fb18f3db0b548c308cd759cea0ba74391135f4 /kernel.spec
parent99c4e998b3ba0b8d4bbb55d3714d1eaae765a78f (diff)
downloadkernel-7eb10928fe13e4b6418e61914e569b1f4263fe89.tar.gz
kernel-7eb10928fe13e4b6418e61914e569b1f4263fe89.tar.xz
kernel-7eb10928fe13e4b6418e61914e569b1f4263fe89.zip
Add two patches from Seth Forshee to fix brcmsmac backtrace
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec11
1 files changed, 10 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index ff2a7c74..11c189c7 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -62,7 +62,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 1
+%global baserelease 2
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -743,6 +743,9 @@ Patch22001: selinux-apply-different-permission-to-ptrace-child.patch
#rhbz 836742
Patch22059: uvcvideo-Reset-bytesused-field-when-recycling-erroneous-buffer.patch
+Patch22062: cfg80211-add-channel-flag-to-prohibit-OFDM-operation.patch
+Patch22063: brcmsmac-use-channel-flags-to-restrict-OFDM.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -1431,6 +1434,9 @@ ApplyPatch selinux-apply-different-permission-to-ptrace-child.patch
#rhbz 836742
ApplyPatch uvcvideo-Reset-bytesused-field-when-recycling-erroneous-buffer.patch
+ApplyPatch cfg80211-add-channel-flag-to-prohibit-OFDM-operation.patch
+ApplyPatch brcmsmac-use-channel-flags-to-restrict-OFDM.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -2288,6 +2294,9 @@ fi
# ||----w |
# || ||
%changelog
+* Thu Aug 02 2012 Josh Boyer <jwboyer@redhat.com>
+- Add two patches from Seth Forshee to fix brcmsmac backtrace
+
* Thu Aug 02 2012 Josh Boyer <jwboyer@redhat.com> - 3.6.0-0.rc0.git9.1
- Linux v3.5-9139-g1a9b499