diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-23 09:23:33 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-23 09:23:33 +0200 |
| commit | 8083f3d78825c0ea1948339613914b46105bfd0b (patch) | |
| tree | 25319c8651919f48cbae12eb3fe7490413ff9669 /drivers/crypto/omap-sham.c | |
| parent | lkdtm: Check for SMEP clearing protections (diff) | |
| parent | Linux 5.2-rc6 (diff) | |
| download | linux-8083f3d78825c0ea1948339613914b46105bfd0b.tar.xz linux-8083f3d78825c0ea1948339613914b46105bfd0b.zip | |
Merge 5.2-rc6 into char-misc-next
We need the char-misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/crypto/omap-sham.c')
| -rw-r--r-- | drivers/crypto/omap-sham.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c index 51b20abac464..e8e2907bd9f4 100644 --- a/drivers/crypto/omap-sham.c +++ b/drivers/crypto/omap-sham.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Cryptographic API. * @@ -7,10 +8,6 @@ * Author: Dmitry Kasatkin <dmitry.kasatkin@nokia.com> * Copyright (c) 2011 Texas Instruments Incorporated * - * 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 old omap-sha1-md5.c driver. */ |