diff options
author | Mark Brown <broonie@kernel.org> | 2019-06-26 14:39:34 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-06-26 14:39:34 +0300 |
commit | 53c8b29abe42e5601cfa0ea5962532f0cfdec8a0 (patch) | |
tree | cad53f42ce7a03c39a984bcdbcc42cd47f1af6f9 /arch/x86/crypto/chacha-ssse3-x86_64.S | |
parent | e3303268f9cfa4eb7c2217df471417d4327109fd (diff) | |
parent | 4b972a01a7da614b4796475f933094751a295a2f (diff) | |
download | linux-53c8b29abe42e5601cfa0ea5962532f0cfdec8a0.tar.xz |
Merge tag 'v5.2-rc6' into asoc-5.3
Linux 5.2-rc6
Diffstat (limited to 'arch/x86/crypto/chacha-ssse3-x86_64.S')
-rw-r--r-- | arch/x86/crypto/chacha-ssse3-x86_64.S | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86/crypto/chacha-ssse3-x86_64.S b/arch/x86/crypto/chacha-ssse3-x86_64.S index c05a7a963dc3..2d86c7d6dc88 100644 --- a/arch/x86/crypto/chacha-ssse3-x86_64.S +++ b/arch/x86/crypto/chacha-ssse3-x86_64.S @@ -1,12 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * ChaCha 256-bit cipher algorithm, x64 SSSE3 functions * * Copyright (C) 2015 Martin Willi - * - * 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 <linux/linkage.h> |