diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-12-11 08:47:41 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-12-11 08:47:41 +0100 |
commit | 2fc10246766fce0b560f015e1c0b6ff29fb4ced0 (patch) | |
tree | 0510322a0d3a8171afb1e06a7ce809f023578825 /drivers/s390/net/Kconfig | |
parent | misc: isl29003: Missing a blank line after declarations (diff) | |
parent | Linux 4.15-rc3 (diff) | |
download | linux-2fc10246766fce0b560f015e1c0b6ff29fb4ced0.tar.xz linux-2fc10246766fce0b560f015e1c0b6ff29fb4ced0.zip |
Merge 4.15-rc3 into char-misc-next
We want the fixes and changes in here for testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/s390/net/Kconfig')
-rw-r--r-- | drivers/s390/net/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/s390/net/Kconfig b/drivers/s390/net/Kconfig index b2837b1c70b7..a782a207ad31 100644 --- a/drivers/s390/net/Kconfig +++ b/drivers/s390/net/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 menu "S/390 network device drivers" depends on NETDEVICES && S390 |