diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-03 13:53:20 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-03 13:53:20 +0200 |
| commit | 888dc273ea4e7ca332a6f73d10dfc8f2b212c803 (patch) | |
| tree | 0c2154dfa92ca6ee761c358e58a3e35831558bb5 /arch/sparc/crypto/camellia_glue.c | |
| parent | tty: cpm_uart: drop unused iflag macro (diff) | |
| parent | Linux 5.2-rc3 (diff) | |
| download | linux-888dc273ea4e7ca332a6f73d10dfc8f2b212c803.tar.xz linux-888dc273ea4e7ca332a6f73d10dfc8f2b212c803.zip | |
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/sparc/crypto/camellia_glue.c')
| -rw-r--r-- | arch/sparc/crypto/camellia_glue.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc/crypto/camellia_glue.c b/arch/sparc/crypto/camellia_glue.c index 900d5c617e83..3823f9491a72 100644 --- a/arch/sparc/crypto/camellia_glue.c +++ b/arch/sparc/crypto/camellia_glue.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* Glue code for CAMELLIA encryption optimized for sparc64 crypto opcodes. * * Copyright (C) 2012 David S. Miller <davem@davemloft.net> |