summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2012-04-23 16:50:35 +1000
committerJosh Boyer <jwboyer@redhat.com>2012-04-23 20:39:51 -0400
commit49fd71050470b5a5a380f38b6dcf02a13b688622 (patch)
tree6511820c7ffa5ffcd473cb068ae9e94c4b078060 /kernel.spec
parentfc272f656da35fb37e45851784b07415bd03865f (diff)
downloadkernel-49fd71050470b5a5a380f38b6dcf02a13b688622.tar.gz
kernel-49fd71050470b5a5a380f38b6dcf02a13b688622.tar.xz
kernel-49fd71050470b5a5a380f38b6dcf02a13b688622.zip
Fix regression on clickpads
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec9
1 files changed, 8 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index f5b2d81e7..bab6fc5ec 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 2
+%global baserelease 3
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -752,6 +752,8 @@ Patch22001: selinux-apply-different-permission-to-ptrace-child.patch
#rhbz 814278 814289 CVE-2012-2119
Patch22007: macvtap-zerocopy-validate-vector-length.patch
+Patch22011: input-synaptics-fix-regression-with-image-sensor-trackpads.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -1453,6 +1455,8 @@ ApplyPatch x86-microcode-Ensure-that-module-is-only-loaded-for-supported-AMD-CPU
#rhbz 814278 814289 CVE-2012-2119
ApplyPatch macvtap-zerocopy-validate-vector-length.patch
+ApplyPatch input-synaptics-fix-regression-with-image-sensor-trackpads.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -2323,6 +2327,9 @@ fi
# ||----w |
# || ||
%changelog
+* Mon Apr 23 2012 Peter Hutterer <peter.hutterer@redhat.com>
+- Fix regression on clickpads
+
* Mon Apr 23 2012 Josh Boyer <jwboyer@gmail.com> - 3.4.0-0.rc4.git0.2
- Add GMA3600 (Cedarview) support (rhbz 810686)
- Reenable debugging options.