diff options
| author | Kyle McMartin <kmcmarti@redhat.com> | 2014-08-12 11:18:04 -0400 |
|---|---|---|
| committer | Kyle McMartin <kmcmarti@redhat.com> | 2014-08-12 11:18:04 -0400 |
| commit | 5da751d0824d31963b384cbbef0f1310d6a9217f (patch) | |
| tree | e341e12a5b6f5b691fd3479b28ff740a12ed1862 /kernel.spec | |
| parent | 39f3a276ce8517ac9e52bb648317e498452c2817 (diff) | |
| download | kernel-5da751d0824d31963b384cbbef0f1310d6a9217f.tar.gz kernel-5da751d0824d31963b384cbbef0f1310d6a9217f.tar.xz kernel-5da751d0824d31963b384cbbef0f1310d6a9217f.zip | |
kernel-arm64.patch: fix up merge conflict and re-enable
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec index 6396d15df..087058fb4 100644 --- a/kernel.spec +++ b/kernel.spec @@ -8,7 +8,7 @@ Summary: The Linux kernel # be 0. %global released_kernel 0 -%global aarch64patches 0 +%global aarch64patches 1 # Sign modules on x86. Make sure the config files match this setting if more # architectures are added. @@ -2240,6 +2240,9 @@ fi # ||----w | # || || %changelog +* Tue Aug 12 2014 Kyle McMartin <kyle@fedoraproject.org> +- kernel-arm64.patch: fix up merge conflict and re-enable + * Tue Aug 12 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc0.git4.1 - Linux v3.16-10473-gc8d6637d0497 |