summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@redhat.com>2012-04-03 16:47:59 -0500
committerJustin M. Forbes <jforbes@redhat.com>2012-04-03 16:47:59 -0500
commitdd4f1a4e5767fcec94e7309f83a2dbf5a80f607f (patch)
tree4867ebcfb4c8758928d671394b028dca21351549 /kernel.spec
parent2b796ace80842c69eb8f3ee277f821eee861c7c4 (diff)
parent8390bec6eae6477511ac3d93f37d65e88fbd3b28 (diff)
downloadkernel-dd4f1a4e5767fcec94e7309f83a2dbf5a80f607f.tar.gz
kernel-dd4f1a4e5767fcec94e7309f83a2dbf5a80f607f.tar.xz
kernel-dd4f1a4e5767fcec94e7309f83a2dbf5a80f607f.zip
Merge cleanup
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec12
1 files changed, 9 insertions, 3 deletions
diff --git a/kernel.spec b/kernel.spec
index afdce82a7..b08d2bf62 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -735,11 +735,12 @@ Patch21260: x86-Avoid-invoking-RCU-when-CPU-is-idle.patch
#rhbz 804957 CVE-2012-1568
Patch21306: shlib_base_randomize.patch
+#rhbz 806433
+Patch21360: uvcvideo-Fix-race-induced-crash-in-uvc_video_clock_update.patch
+
Patch21400: unhandled-irqs-switch-to-polling.patch
Patch22000: weird-root-dentry-name-debug.patch
-#
-Patch22100: patch-3.4-rc1-git1.xz
%endif
@@ -1425,7 +1426,9 @@ ApplyPatch weird-root-dentry-name-debug.patch
#Highbank clock functions
ApplyPatch highbank-export-clock-functions.patch
-ApplyPatch patch-3.4-rc1-git1.xz
+
+#rhbz 806433
+ApplyPatch uvcvideo-Fix-race-induced-crash-in-uvc_video_clock_update.patch
# END OF PATCH APPLICATIONS
@@ -2288,6 +2291,9 @@ fi
* Tue Apr 03 2012 Justin M. Forbes <jforbes@redhat.com> - 3.4.0-0.rc1.git1.1
- Linux v3.4-rc1-144-g01627d9
+* Tue Apr 03 2012 Josh Boyer <jwboyer@redhat.com>
+- Fix crash in uvc_video_clock_update from Laurent Pinchart (rhbz 806433)
+
* Mon Apr 02 2012 Justin M. Forbes <jforbes@redhat.com> - 3.4.0-0.rc1.git0.2
- Fix config since koji preps as noarch