summaryrefslogtreecommitdiffstats
path: root/drivers/s390/Makefile
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-12-18 09:08:05 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-12-18 09:08:05 +0100
commitd9e3d899bc7a852d44b3305ed49799fbf090e756 (patch)
treef3a75cb5f60be908a4384bd9e7add08486d7d338 /drivers/s390/Makefile
parentcc2e60dfa6ba4ff2c054bca932b9afc8702a2f9a (diff)
parent1291a0d5049dbc06baaaf66a9ff3f53db493b19b (diff)
downloadlinux-d9e3d899bc7a852d44b3305ed49799fbf090e756.tar.bz2
Merge 4.15-rc4 into usb-next
We want the USB fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/s390/Makefile')
-rw-r--r--drivers/s390/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/s390/Makefile b/drivers/s390/Makefile
index e5225ad9c5b1..2fdab400c1fe 100644
--- a/drivers/s390/Makefile
+++ b/drivers/s390/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
#
# Makefile for the S/390 specific device drivers
#