summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2013-09-05 10:43:44 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2013-09-05 10:43:44 -0400
commitd5a4efb50adef352b7dde6079d5df07042f2d248 (patch)
tree51732e83eac7b4f5ddacd56d93540094bf353495 /kernel.spec
parentf55bd27d50aa3ee15819e85ca0984a3af33d3c30 (diff)
downloadkernel-d5a4efb50adef352b7dde6079d5df07042f2d248.tar.gz
kernel-d5a4efb50adef352b7dde6079d5df07042f2d248.tar.xz
kernel-d5a4efb50adef352b7dde6079d5df07042f2d248.zip
Fix perf build on ARM (from Kyle McMartin)
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec7
1 files changed, 7 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index 0ff22bf61..92dbccbef 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -776,6 +776,8 @@ Patch25077: media-cx23885-Fix-TeVii-S471-regression-since-introduction-of-ts2020
#CVE-2013-2897 rhbz 1000536 1002600 CVE-2013-2899 rhbz 1000373 1002604
Patch25099: HID-CVE-fixes.patch
+Patch25100: perf-arm-fix.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -1510,6 +1512,8 @@ ApplyPatch media-cx23885-Fix-TeVii-S471-regression-since-introduction-of-ts2020.
#CVE-2013-2897 rhbz 1000536 1002600 CVE-2013-2899 rhbz 1000373 1002604
ApplyPatch HID-CVE-fixes.patch
+ApplyPatch perf-arm-fix.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -2312,6 +2316,9 @@ fi
# || ||
%changelog
* Thu Sep 05 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git11.1
+- Fix perf build on ARM (from Kyle McMartin)
+
+* Thu Sep 05 2013 Josh Boyer <jwboyer@fedoraproject.org>
- Linux v3.11-3891-gae7a835
* Thu Sep 05 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git10.1