diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-11-08 03:11:56 +0100 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-11-08 03:11:56 +0100 |
commit | 0f1cd81d4a50ca99fb0b5cd8f68584bc5acab081 (patch) | |
tree | f0aa64e956d1d2addb2263ddcd238e9f014b36a0 /net/sunrpc/auth_gss/Makefile | |
parent | Input: convert autorepeat timer to use timer_setup() (diff) | |
parent | Linux 4.14-rc8 (diff) | |
download | linux-0f1cd81d4a50ca99fb0b5cd8f68584bc5acab081.tar.xz linux-0f1cd81d4a50ca99fb0b5cd8f68584bc5acab081.zip |
Merge tag 'v4.14-rc8' into next
Merge with mainline to bring in SPDX markings to avoid annoying merge
problems when some header files get deleted.
Diffstat (limited to 'net/sunrpc/auth_gss/Makefile')
-rw-r--r-- | net/sunrpc/auth_gss/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sunrpc/auth_gss/Makefile b/net/sunrpc/auth_gss/Makefile index 14e9e53e63d5..c374268b008f 100644 --- a/net/sunrpc/auth_gss/Makefile +++ b/net/sunrpc/auth_gss/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 # # Makefile for Linux kernel rpcsec_gss implementation # |