summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2014-04-03 15:59:07 -0400
committerJosh Boyer <jwboyer@redhat.com>2014-04-03 15:59:07 -0400
commit6757044f1a16eb673ae6eb6c570fd4fc1fcfedb9 (patch)
tree915fd53dd9455f9b36bb534462afb5ddd6c438d2
parent4371a55a3793a5571704059f9d1e2506052d359e (diff)
downloadkernel-6757044f1a16eb673ae6eb6c570fd4fc1fcfedb9.tar.gz
kernel-6757044f1a16eb673ae6eb6c570fd4fc1fcfedb9.tar.xz
kernel-6757044f1a16eb673ae6eb6c570fd4fc1fcfedb9.zip
Linux v3.14-7333-g59ecc26004e7
-rw-r--r--config-armv71
-rw-r--r--kernel.spec5
-rw-r--r--sources2
3 files changed, 6 insertions, 2 deletions
diff --git a/config-armv7 b/config-armv7
index 172baa77c..bd0598311 100644
--- a/config-armv7
+++ b/config-armv7
@@ -195,6 +195,7 @@ CONFIG_PWM_TWL_LED=m
CONFIG_CRYPTO_DEV_OMAP_SHAM=m
CONFIG_CRYPTO_DEV_OMAP_AES=m
+CONFIG_CRYPTO_DEV_OMAP_DES=m
CONFIG_HW_RANDOM_OMAP=m
CONFIG_HW_RANDOM_OMAP3_ROM=m
diff --git a/kernel.spec b/kernel.spec
index ef89f4489..2cf31a84e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -61,7 +61,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 0
# The git snapshot level
-%define gitrev 8
+%define gitrev 9
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -2068,6 +2068,9 @@ fi
# ||----w |
# || ||
%changelog
+* Thu Apr 03 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.15.0-0.rc0.git9.1
+- Linux v3.14-7333-g59ecc26004e7
+
* Thu Apr 03 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.15.0-0.rc0.git8.1
- Linux v3.14-7247-gcd6362befe4c
diff --git a/sources b/sources
index c3a9281b7..b94335386 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
b621207b3f6ecbb67db18b13258f8ea8 linux-3.14.tar.xz
d36baf2d62de5aa61f10a976d00d2d2a perf-man-3.14.tar.gz
-4f6a8f55799e38e21c34c3b4b67a51f8 patch-3.14-git8.xz
+1ffb416fada7ceb3e051253d4c582b3d patch-3.14-git9.xz