summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2013-02-19 11:21:29 -0500
committerJosh Boyer <jwboyer@redhat.com>2013-02-19 11:21:33 -0500
commit5c860185af2788138c9bed235283a38186829ef2 (patch)
tree486c52748db25507640478725f2f12805574d762 /kernel.spec
parent5ac38ff07bcb03a6e32bbe2405d134e3ccac1696 (diff)
downloadkernel-5c860185af2788138c9bed235283a38186829ef2.tar.gz
kernel-5c860185af2788138c9bed235283a38186829ef2.tar.xz
kernel-5c860185af2788138c9bed235283a38186829ef2.zip
Backport support for newer ALPS touchpads (rhbz 812111)
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 a9c235ed2..795e17e31 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,9 @@ Patch22000: weird-root-dentry-name-debug.patch
#selinux ptrace child permissions
Patch22001: selinux-apply-different-permission-to-ptrace-child.patch
+#rhbz 812111
+Patch21260: alps-v2.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -1455,6 +1458,9 @@ ApplyPatch pstore-Create-a-convenient-mount-point-for-pstore.patch
#rhbz 909591
ApplyPatch usb-cypress-supertop.patch
+#rhbz 812111
+ApplyPatch alps-v2.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -2311,6 +2317,7 @@ fi
# || ||
%changelog
* Tue Feb 19 2013 Josh Boyer <jwboyer@redhat.com>
+- Backport support for newer ALPS touchpads (rhbz 812111)
- Enable CONFIG_AUDIT_LOGINUID_IMMUTABLE
* Tue Feb 19 2013 Josh Boyer <jwboyer@redhat.com> - 3.8.0-1