summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2013-01-29 08:41:36 -0500
committerJosh Boyer <jwboyer@redhat.com>2013-01-29 08:49:12 -0500
commit655567cad9234701704192050d2fbf2b11e55803 (patch)
tree94e09672db84b25a7353bad1c6486c94313a4f75 /kernel.spec
parent1c73ec9b847ec860f7a28f7fea8b5cb15cfd19b3 (diff)
downloadkernel-655567cad9234701704192050d2fbf2b11e55803.tar.gz
kernel-655567cad9234701704192050d2fbf2b11e55803.tar.xz
kernel-655567cad9234701704192050d2fbf2b11e55803.zip
Backport driver for Cypress PS/2 trackpad (rhbz 799564)
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec13
1 files changed, 12 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index 3703692da..e1e4f5eaf 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
@@ -753,6 +753,10 @@ Patch21227: iwlegacy-fix-IBSS-cleanup.patch
Patch21228: iwlwifi-audit-single-frames-from-AGG-queue-in-RS.patch
Patch21229: Revert-iwlwifi-fix-the-reclaimed-packet-tracking-upon.patch
+#rhbz 799564
+Patch21240: Input-increase-struct-ps2dev-cmdbuf-to-8-bytes.patch
+Patch21241: Input-add-support-for-Cypress-PS2-Trackpads.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -1451,6 +1455,10 @@ ApplyPatch iwlegacy-fix-IBSS-cleanup.patch
ApplyPatch iwlwifi-audit-single-frames-from-AGG-queue-in-RS.patch
ApplyPatch Revert-iwlwifi-fix-the-reclaimed-packet-tracking-upon.patch
+#rhbz 799564
+ApplyPatch Input-increase-struct-ps2dev-cmdbuf-to-8-bytes.patch
+ApplyPatch Input-add-support-for-Cypress-PS2-Trackpads.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -2306,6 +2314,9 @@ fi
# ||----w |
# || ||
%changelog
+* Tue Jan 29 2013 Josh Boyer <jwboyer@redhat.com>
+- Backport driver for Cypress PS/2 trackpad (rhbz 799564)
+
* Mon Jan 28 2013 Josh Boyer <jwboyer@redhat.com> - 3.8.0-0.rc5.git0.1
- Linux v3.8-rc5
- Add patches to fix issues with iwlwifi (rhbz 863424)