diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2011-12-02 15:57:37 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2011-12-02 16:20:17 -0500 |
| commit | 9f33e8dbe2bc1df45e8461e255d5037c21f0fa46 (patch) | |
| tree | 1df757f2958e745c627a7dff267dc542dd3b99f5 /kernel.spec | |
| parent | f7c8fbc8125b6416ad09a288fb22acc75fec8cb2 (diff) | |
| download | kernel-9f33e8dbe2bc1df45e8461e255d5037c21f0fa46.tar.gz kernel-9f33e8dbe2bc1df45e8461e255d5037c21f0fa46.tar.xz kernel-9f33e8dbe2bc1df45e8461e255d5037c21f0fa46.zip | |
Backport ALPS touchpad patches from input/next branch (rhbz #590880)
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec index b6c10c7c2..38e5d7027 100644 --- a/kernel.spec +++ b/kernel.spec @@ -54,7 +54,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 3 +%global baserelease 4 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -714,6 +714,9 @@ Patch21091: pci-Rework-ASPM-disable-code.patch #rhbz 753236 Patch21029: nfsv4-include-bitmap-in-nfsv4_get_acl_data.patch +#rhbz 590880 +Patch21030: alps.patch + %endif BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root @@ -1372,6 +1375,9 @@ ApplyPatch pci-Rework-ASPM-disable-code.patch #rhbz 753236 ApplyPatch nfsv4-include-bitmap-in-nfsv4_get_acl_data.patch +#rhbz 590880 +ApplyPatch alps.patch + # END OF PATCH APPLICATIONS %endif @@ -2171,7 +2177,8 @@ fi # ||----w | # || || %changelog -* Fri Dec 02 2011 Josh Boyer <jwboyer@redhat.com> +* Fri Dec 02 2011 Josh Boyer <jwboyer@redhat.com> 3.2.0-0.rc4.git1.4.fc17 +- Backport ALPS touchpad patches from input/next branch (rhbz #590880) - Apply patch from John Linville to reverse modules-extra dependency order - Put ssb.ko back in the main kernel package |