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/phy/mscc | |
| 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/phy/mscc')
| -rw-r--r-- | drivers/phy/mscc/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/phy/mscc/Makefile | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/phy/mscc/Kconfig b/drivers/phy/mscc/Kconfig index 2e2a466efd66..83be16d39727 100644 --- a/drivers/phy/mscc/Kconfig +++ b/drivers/phy/mscc/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only # # Phy drivers for Microsemi devices # diff --git a/drivers/phy/mscc/Makefile b/drivers/phy/mscc/Makefile index e14749170fc9..7bec61adbfb1 100644 --- a/drivers/phy/mscc/Makefile +++ b/drivers/phy/mscc/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only # # Makefile for the Microsemi phy drivers. # |