summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec16
1 files changed, 15 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index bcd403f05..f33fd7247 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 4
# The git snapshot level
-%define gitrev 2
+%define gitrev 3
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -615,6 +615,11 @@ Patch26016: HID-wacom-Add-support-for-the-Cintiq-Companion.patch
#rhbz 1116347
Patch26017: KEYS-Fix-termination-condition-in-assoc-array-garbag.patch
+#rhbz 1110011
+Patch26018: i8042-Also-store-the-aux-firmware-id-in-multi-plexed.patch
+Patch26019: psmouse-Add-psmouse_matches_pnp_id-helper-function.patch
+Patch26020: psmouse-Add-support-for-detecting-FocalTech-PS-2-tou.patch
+
# git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel
Patch30000: kernel-arm64.patch
@@ -1341,6 +1346,11 @@ ApplyPatch HID-wacom-Add-support-for-the-Cintiq-Companion.patch
#rhbz 1116347
ApplyPatch KEYS-Fix-termination-condition-in-assoc-array-garbag.patch
+#rhbz 1110011
+ApplyPatch i8042-Also-store-the-aux-firmware-id-in-multi-plexed.patch
+ApplyPatch psmouse-Add-psmouse_matches_pnp_id-helper-function.patch
+ApplyPatch psmouse-Add-support-for-detecting-FocalTech-PS-2-tou.patch
+
%if 0%{?aarch64patches}
ApplyPatch kernel-arm64.patch
%ifnarch aarch64 # this is stupid, but i want to notice before secondary koji does.
@@ -2209,6 +2219,10 @@ fi
# ||----w |
# || ||
%changelog
+* Thu Sep 11 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc4.git3.1
+- Linux v3.17-rc4-168-g7ec62d421bdf
+- Add support for touchpad in Asus X450 and X550 (rhbz 1110011)
+
* Wed Sep 10 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc4.git2.1
- Linux v3.17-rc4-158-ge874a5fe3efa
- Add patch to fix oops on keyring gc (rhbz 1116347)