summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2015-09-29 12:19:09 +0300
committerJames Morris <james.l.morris@oracle.com>2015-09-29 12:19:09 +0300
commit0266715155379820c5c626e2cd4b8c91751036bc (patch)
tree86ba7b7066ca81eb7fe0cebdd2fc2ebe0f938bef /Documentation
parent3225031fbeb1e32b269a82eccd815128267a4bfe (diff)
parent283e8ba2dfde54f8f27d7d0f459a07de79a39d55 (diff)
downloadlinux-0266715155379820c5c626e2cd4b8c91751036bc.tar.xz
Merge tag 'keys-fixes-20150925' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into for-linus
Keyrings fixes from David Howells, for current Linus.
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/Changes2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/Changes b/Documentation/Changes
index 6d8863004858..f447f0516f07 100644
--- a/Documentation/Changes
+++ b/Documentation/Changes
@@ -43,7 +43,7 @@ o udev 081 # udevd --version
o grub 0.93 # grub --version || grub-install --version
o mcelog 0.6 # mcelog --version
o iptables 1.4.2 # iptables -V
-o openssl & libcrypto 1.0.1k # openssl version
+o openssl & libcrypto 1.0.0 # openssl version
Kernel compilation