diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-11-07 18:11:56 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-11-07 18:11:56 -0800 |
| commit | 0f1cd81d4a50ca99fb0b5cd8f68584bc5acab081 (patch) | |
| tree | f0aa64e956d1d2addb2263ddcd238e9f014b36a0 /net/atm/mpoa_proc.c | |
| parent | 4e974c120039e35b90d2cb0459452bd9a6a71594 (diff) | |
| parent | 39dae59d66acd86d1de24294bd2f343fd5e7a625 (diff) | |
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/atm/mpoa_proc.c')
| -rw-r--r-- | net/atm/mpoa_proc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/atm/mpoa_proc.c b/net/atm/mpoa_proc.c index 2df34eb5d65f..8a0c17e1c203 100644 --- a/net/atm/mpoa_proc.c +++ b/net/atm/mpoa_proc.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__ #ifdef CONFIG_PROC_FS |