diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-03 14:53:20 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-03 14:53:20 +0300 |
| commit | 888dc273ea4e7ca332a6f73d10dfc8f2b212c803 (patch) | |
| tree | 0c2154dfa92ca6ee761c358e58a3e35831558bb5 /arch/arm/crypto/sha1-armv7-neon.S | |
| parent | 324e8f5f5d9d4d0b9a608b2fdb88cd93b0fbb12a (diff) | |
| parent | f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a (diff) | |
| download | linux-888dc273ea4e7ca332a6f73d10dfc8f2b212c803.tar.xz | |
Merge 5.2-rc3 into tty-next
We want the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/crypto/sha1-armv7-neon.S')
| -rw-r--r-- | arch/arm/crypto/sha1-armv7-neon.S | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/crypto/sha1-armv7-neon.S b/arch/arm/crypto/sha1-armv7-neon.S index 2468fade49cf..28d816a6a530 100644 --- a/arch/arm/crypto/sha1-armv7-neon.S +++ b/arch/arm/crypto/sha1-armv7-neon.S @@ -1,11 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* sha1-armv7-neon.S - ARM/NEON accelerated SHA-1 transform function * * Copyright © 2013-2014 Jussi Kivilinna <jussi.kivilinna@iki.fi> - * - * 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> |