diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-09 09:11:21 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-09 09:11:21 +0200 |
| commit | 0154ec71d597692a0d0682b19eac4b3adfb7f3dc (patch) | |
| tree | 121b4ac35146f5696da090d3ae2534c76523e6c2 /drivers/sn | |
| parent | VMCI: Fixup atomic64_t abuse (diff) | |
| parent | Linux 5.2-rc4 (diff) | |
| download | linux-0154ec71d597692a0d0682b19eac4b3adfb7f3dc.tar.xz linux-0154ec71d597692a0d0682b19eac4b3adfb7f3dc.zip | |
Merge 5.2-rc4 into char-misc-next
We want the char/misc driver fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/sn')
| -rw-r--r-- | drivers/sn/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/sn/Makefile | 1 | ||||
| -rw-r--r-- | drivers/sn/ioc3.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/drivers/sn/Kconfig b/drivers/sn/Kconfig index c66ba9ad833d..a6c443d31a3c 100644 --- a/drivers/sn/Kconfig +++ b/drivers/sn/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only # # Miscellaneous SN-specific devices # diff --git a/drivers/sn/Makefile b/drivers/sn/Makefile index 693db8bb8d9c..f0e809a38b2d 100644 --- a/drivers/sn/Makefile +++ b/drivers/sn/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only # # Makefile for the Altix device drivers. # diff --git a/drivers/sn/ioc3.c b/drivers/sn/ioc3.c index fb7ea0d9a734..358025af4918 100644 --- a/drivers/sn/ioc3.c +++ b/drivers/sn/ioc3.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * SGI IOC3 master driver and IRQ demuxer * |