diff options
| author | David S. Miller <davem@davemloft.net> | 2017-11-04 03:26:51 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-04 03:26:51 +0300 |
| commit | 2a171788ba7bb61995e98e8163204fc7880f63b2 (patch) | |
| tree | 4150a94dd08323748116e5051e56ddee830d4812 /net/x25 | |
| parent | bf5345882bd18bc1b4966d170c0491ebe5c9a7d6 (diff) | |
| parent | d4c2e9fca5b7db8d315d93a072e65d0847f8e0c5 (diff) | |
| download | linux-2a171788ba7bb61995e98e8163204fc7880f63b2.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Files removed in 'net-next' had their license header updated
in 'net'. We take the remove from 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/x25')
| -rw-r--r-- | net/x25/Makefile | 1 | ||||
| -rw-r--r-- | net/x25/sysctl_net_x25.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/net/x25/Makefile b/net/x25/Makefile index a2c34ab6f194..5dd544a231f2 100644 --- a/net/x25/Makefile +++ b/net/x25/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 # # Makefile for the Linux X.25 Packet layer. # diff --git a/net/x25/sysctl_net_x25.c b/net/x25/sysctl_net_x25.c index ba078c85f0a1..e9802afa43d0 100644 --- a/net/x25/sysctl_net_x25.c +++ b/net/x25/sysctl_net_x25.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* -*- linux-c -*- * sysctl_net_x25.c: sysctl interface to net X.25 subsystem. * |