diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-12-12 13:25:54 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-12-12 13:25:54 +0100 |
commit | 76523de61993d015f7895d06deacd3fd454574a1 (patch) | |
tree | 7b2890ac9733c55ff73c72bba7b6b5c788ba925b /arch/s390/crypto/sha1_s390.c | |
parent | e7ed9d9bd0375c74fe6e27d8bc73d3c6f4c8c3bc (diff) | |
parent | 50c4c4e268a2d7a3e58ebb698ac74da0de40ae36 (diff) |
Merge tag 'v4.15-rc3' into perf/core, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/s390/crypto/sha1_s390.c')
-rw-r--r-- | arch/s390/crypto/sha1_s390.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/s390/crypto/sha1_s390.c b/arch/s390/crypto/sha1_s390.c index c7de53d8da75..a00c17f761c1 100644 --- a/arch/s390/crypto/sha1_s390.c +++ b/arch/s390/crypto/sha1_s390.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Cryptographic API. * @@ -16,12 +17,6 @@ * Copyright (c) Alan Smithee. * Copyright (c) Andrew McDonald <andrew@mcdonald.org.uk> * Copyright (c) Jean-Francois Dive <jef@linuxbe.org> - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at your option) - * any later version. - * */ #include <crypto/internal/hash.h> #include <linux/init.h> |