diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-23 09:21:15 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-23 09:21:15 +0200 |
| commit | 94676a2c44ac011fb1427f31f1fb98b9b3231b4c (patch) | |
| tree | 732d485654b0c8074db30d2e1246a24022f8442b /crypto/gcm.c | |
| parent | 4c3c8f1016e9854690d93cbc4a825af6594d40e4 (diff) | |
| parent | e3b5593df487b2a100ebb41d239aa4bb7d597735 (diff) | |
| download | linux-crypto-94676a2c44ac011fb1427f31f1fb98b9b3231b4c.tar.gz linux-crypto-94676a2c44ac011fb1427f31f1fb98b9b3231b4c.zip | |
Merge 5.2-rc6 into usb-next
We need the USB fixes in here too.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to '')
| -rw-r--r-- | crypto/gcm.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/crypto/gcm.c b/crypto/gcm.c index 33f45a98..f254e2d4 100644 --- a/crypto/gcm.c +++ b/crypto/gcm.c @@ -1,11 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * GCM: Galois/Counter Mode. * * Copyright (c) 2007 Nokia Siemens Networks - Mikko Herranen <mh1@iki.fi> - * - * 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. */ #include <crypto/gf128mul.h> |