summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2012-04-30 15:23:12 -0400
committerJosh Boyer <jwboyer@redhat.com>2012-04-30 15:29:21 -0400
commitc0506b7354642e96768885a133d35054d4de598a (patch)
tree1a8da127df9e98c5cbcadd269c98ac875bca1c47 /kernel.spec
parentcb46c3674a4a51b597df10678d1750b9b0fe0553 (diff)
downloadkernel-c0506b7354642e96768885a133d35054d4de598a.tar.gz
kernel-c0506b7354642e96768885a133d35054d4de598a.tar.xz
kernel-c0506b7354642e96768885a133d35054d4de598a.zip
Backport ipw2x00 nl80211 cipher suite reporting (rhbz 817298)
Correct my email address. I blame auto-scripts.
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec15
1 files changed, 12 insertions, 3 deletions
diff --git a/kernel.spec b/kernel.spec
index 5ee49b4ed..3da2055c7 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -753,6 +753,9 @@ Patch22011: input-synaptics-fix-regression-with-image-sensor-trackpads.patch
#rhbz 802106
Patch22012: ipw2200-Fix-race-condition-in-the-command-completion-acknowledge.patch
+#rhbz 817298
+Patch22013: ipw2x00-add-supported-cipher-suites-to-wiphy-initialization.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -1454,6 +1457,9 @@ ApplyPatch input-synaptics-fix-regression-with-image-sensor-trackpads.patch
#rhbz 802106
ApplyPatch ipw2200-Fix-race-condition-in-the-command-completion-acknowledge.patch
+#rhbz 817298
+ApplyPatch ipw2x00-add-supported-cipher-suites-to-wiphy-initialization.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -2324,14 +2330,17 @@ fi
# ||----w |
# || ||
%changelog
-* Mon Apr 30 2012 Josh Boyer <jwboyer@gmail.com> - 3.4.0-0.rc5.git0.3
+* Mon Apr 30 2012 Josh Boyer <jwboyer@redhat.com>
+- Backport ipw2x00 nl80211 cipher suite reporting (rhbz 817298)
+
+* Mon Apr 30 2012 Josh Boyer <jwboyer@redhat.com> - 3.4.0-0.rc5.git0.3
- Reenable debugging options.
-* Mon Apr 30 2012 Josh Boyer <jwboyer@gmail.com> - 3.4.0-0.rc5.git0.2
+* Mon Apr 30 2012 Josh Boyer <jwboyer@redhat.com> - 3.4.0-0.rc5.git0.2
- Linux v3.4-rc5
- Disable debugging options.
-* Sat Apr 28 2012 Josh Boyer <jwboyer@gmail.com> - 3.4.0-0.rc4.git4.1
+* Sat Apr 28 2012 Josh Boyer <jwboyer@redhat.com> - 3.4.0-0.rc4.git4.1
- Linux v3.4-rc4-308-gf7b0069
* Fri Apr 27 2012 Josh Boyer <jwboyer@redhat.com> - 3.4.0-0.rc4.git3.1