summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorKyle McMartin <kyle@redhat.com>2013-06-13 14:20:28 -0400
committerKyle McMartin <kyle@redhat.com>2013-06-13 14:20:28 -0400
commit2afa3c795210e222094c47d5c3a4ff06d00f78da (patch)
treedcae6ba553fd5feb91658f3ef9b368611d612289 /kernel.spec
parentf65d528f9143c4352b51e0b2bf54dcde3f2086b6 (diff)
downloadkernel-2afa3c795210e222094c47d5c3a4ff06d00f78da.tar.gz
kernel-2afa3c795210e222094c47d5c3a4ff06d00f78da.tar.xz
kernel-2afa3c795210e222094c47d5c3a4ff06d00f78da.zip
drop upstream arm-export-read_current_timer.patch
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec6
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec
index 09b547226..f05724537 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -695,7 +695,6 @@ Patch15000: nowatchdog-on-virt.patch
# ARM
-Patch21000: arm-export-read_current_timer.patch
# lpae
Patch21001: arm-lpae-ax88796.patch
@@ -1319,7 +1318,6 @@ ApplyPatch debug-bad-pte-modules.patch
#
# ARM
#
-ApplyPatch arm-export-read_current_timer.patch
ApplyPatch arm-lpae-ax88796.patch
ApplyPatch drm-exynos-fix-multiple-definition-build-error.patch
ApplyPatch arm-omap-load-tfp410.patch
@@ -2283,6 +2281,10 @@ fi
# ||----w |
# || ||
%changelog
+* Thu Jun 13 2013 Kyle McMartin <kyle@redhat.com>
+- arm-export-read_current_timer.patch: drop upstream patch
+ (results in duplicate exports)
+
* Wed Jun 12 2013 Peter Robinson <pbrobinson@fedoraproject.org>
- Minor ARM config updates