summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2011-11-29 10:29:39 -0500
committerJosh Boyer <jwboyer@redhat.com>2011-11-29 11:33:34 -0500
commitfe32595ee94a3d500e814728f54bad3edc4409e7 (patch)
tree6eb06b01b4f56f4dd2dc154adcebd5632b3c4b17 /kernel.spec
parent5bd5546b84f5d5f6342230bbead4f08aad1cf153 (diff)
downloadkernel-fe32595ee94a3d500e814728f54bad3edc4409e7.tar.gz
kernel-fe32595ee94a3d500e814728f54bad3edc4409e7.tar.xz
kernel-fe32595ee94a3d500e814728f54bad3edc4409e7.zip
Add patch to fix deadlock in rtlwifi (rhbz #755154)
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec7
1 files changed, 7 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index 7dd3adda4..0a28afa9b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -716,6 +716,9 @@ Patch21091: pci-Rework-ASPM-disable-code.patch
#rhbz 753236
Patch21029: nfsv4-include-bitmap-in-nfsv4_get_acl_data.patch
+#rhbz 755154
+Patch21200: rtlwifi-fix-lps_lock-deadlock.patch
+
%endif
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1376,6 +1379,9 @@ ApplyPatch pci-Rework-ASPM-disable-code.patch
#rhbz 753236
ApplyPatch nfsv4-include-bitmap-in-nfsv4_get_acl_data.patch
+#rhbz 755154
+ApplyPatch rtlwifi-fix-lps_lock-deadlock.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -2172,6 +2178,7 @@ fi
* Tue Nov 29 2011 Josh Boyer <jwboyer@redhat.com>
- Add modules-extra subpackage
- Drop drm-intel-make-lvds-work.patch (rhbz #731296)
+- Add patch to fix deadlock in rtlwifi (rhbz #755154)
* Tue Nov 29 2011 Josh Boyer <jwboyer@redhat.com> 3.2.0-0.rc3.git1.1
- Linux 3.2-rc3-git1