summaryrefslogtreecommitdiff
path: root/crypto/crypto_null.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2019-06-03 11:56:35 +0200
committerIngo Molnar <mingo@kernel.org>2019-06-03 11:56:35 +0200
commitf7b6a8b30cedaa64ba18d80f1fb3404274281639 (patch)
tree13937ba94eed328bb19b1ccf343cca35446b878b /crypto/crypto_null.c
parentb33fb3cf6f5e039dea4a85a708a2c86f8a323575 (diff)
parentf2c7c76c5d0a443053e94adb9f0918fa2fb85c3a (diff)
Merge tag 'v5.2-rc3' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'crypto/crypto_null.c')
-rw-r--r--crypto/crypto_null.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/crypto/crypto_null.c b/crypto/crypto_null.c
index 9320d4eaa4a8a..0d341ddecd542 100644
--- a/crypto/crypto_null.c
+++ b/crypto/crypto_null.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Cryptographic API.
*
@@ -9,12 +10,6 @@
* The null cipher is compliant with RFC2410.
*
* Copyright (c) 2002 James Morris <jmorris@intercode.com.au>
- *
- * 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/null.h>