diff options
author | Mark Brown <broonie@kernel.org> | 2019-06-10 18:52:53 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-06-10 18:52:53 +0100 |
commit | 4343f61103cdb8ccd6f3d5dd7168f1176a1cee37 (patch) | |
tree | 3db0a2e099cf7feb0c2d60d2a4bf1bf10d5253db /include/net/mpls.h | |
parent | aef9752274f4045b0dab577e113da63c96832f77 (diff) | |
parent | d1fdb6d8f6a4109a4263176c84b899076a5f8008 (diff) | |
download | talos-op-linux-4343f61103cdb8ccd6f3d5dd7168f1176a1cee37.tar.gz talos-op-linux-4343f61103cdb8ccd6f3d5dd7168f1176a1cee37.zip |
Merge tag 'v5.2-rc4' into spi-5.3
Linux 5.2-rc4
Diffstat (limited to 'include/net/mpls.h')
-rw-r--r-- | include/net/mpls.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/include/net/mpls.h b/include/net/mpls.h index 1dbc669b770e..ccaf238e8ea7 100644 --- a/include/net/mpls.h +++ b/include/net/mpls.h @@ -1,14 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2014 Nicira, Inc. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. */ #ifndef _NET_MPLS_H |