diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-10-29 07:20:52 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-10-29 07:20:52 +0100 |
| commit | f0718d792b8a6d4b5ddc929e418ac57cc4897375 (patch) | |
| tree | 3dbaa824ce380e99709fae47c047383ca39c983a /drivers/crypto/atmel-tdes.c | |
| parent | efe8eaf7b525f1be26fe20d723d2bfbfcd7455fd (diff) | |
| parent | b59dfdaef173677b0b7e10f375226c0a1114fd20 (diff) | |
| download | talos-op-linux-f0718d792b8a6d4b5ddc929e418ac57cc4897375.tar.gz talos-op-linux-f0718d792b8a6d4b5ddc929e418ac57cc4897375.zip | |
Merge branch 'linus' into perf/urgent, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/crypto/atmel-tdes.c')
| -rw-r--r-- | drivers/crypto/atmel-tdes.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/crypto/atmel-tdes.c b/drivers/crypto/atmel-tdes.c index 97b0423efa7f..438e1ffb2ec0 100644 --- a/drivers/crypto/atmel-tdes.c +++ b/drivers/crypto/atmel-tdes.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Cryptographic API. * @@ -6,10 +7,6 @@ * Copyright (c) 2012 Eukréa Electromatique - ATMEL * Author: Nicolas Royer <nicolas@eukrea.com> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as published - * by the Free Software Foundation. - * * Some ideas are from omap-aes.c drivers. */ |
