diff options
| author | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2019-06-19 15:18:48 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2019-06-19 15:18:48 +0200 |
| commit | dd90ed66a1cd9cb277881b40295229ba2f81355e (patch) | |
| tree | 9d316a6f7ed462d132786f074da835b8ff1f7196 /crypto/ansi_cprng.c | |
| parent | cd574ee16ffa2f2cad8414b9c59520e3e08a77f9 (diff) | |
| parent | a84aadf66a5970b4ada37b58f16c50dd797f2935 (diff) | |
| download | linux-crypto-dd90ed66a1cd9cb277881b40295229ba2f81355e.tar.gz linux-crypto-dd90ed66a1cd9cb277881b40295229ba2f81355e.zip | |
Merge tag 'topic/remove-fbcon-notifiers-2019-06-14-1' of git://anongit.freedesktop.org/drm/drm-misc into fbdev-for-next
topic/remove-fbcon-notifiers:
- remove fbdev notifier usage for fbcon, as prep work to clean up the fbcon locking
- assorted locking checks in vt/console code
- assorted notifier and cleanups in fbdev and backlight code
One trivial merge conflict fixed.
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Diffstat (limited to '')
| -rw-r--r-- | crypto/ansi_cprng.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/crypto/ansi_cprng.c b/crypto/ansi_cprng.c index e7c43ea4..c475c112 100644 --- a/crypto/ansi_cprng.c +++ b/crypto/ansi_cprng.c @@ -1,16 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * PRNG: Pseudo Random Number Generator * Based on NIST Recommended PRNG From ANSI X9.31 Appendix A.2.4 using * AES 128 cipher * * (C) Neil Horman <nhorman@tuxdriver.com> - * - * 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 - * any later version. - * - * */ #include <crypto/internal/rng.h> |