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/camellia_generic.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 'crypto/camellia_generic.c')
-rw-r--r-- | crypto/camellia_generic.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/crypto/camellia_generic.c b/crypto/camellia_generic.c index 15ce1281..b6a1121e 100644 --- a/crypto/camellia_generic.c +++ b/crypto/camellia_generic.c @@ -1,19 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2006 * NTT (Nippon Telegraph and Telephone Corporation). - * - * 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. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. */ /* |