summaryrefslogtreecommitdiffstats
path: root/drivers/net/ipvlan/ipvlan_core.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2019-06-17 12:00:22 +0200
committerIngo Molnar <mingo@kernel.org>2019-06-17 12:00:22 +0200
commit7b347ad4938ddca1a22b983e36b9ef825a72d230 (patch)
tree93b6262da516cda28465a8dc0c4a6a95525cbbd8 /drivers/net/ipvlan/ipvlan_core.c
parent9db9b76767f133d0e1ce19f01117c83221641899 (diff)
parent9e0babf2c06c73cda2c0cd37a1653d823adb40ec (diff)
downloadtalos-op-linux-7b347ad4938ddca1a22b983e36b9ef825a72d230.tar.gz
talos-op-linux-7b347ad4938ddca1a22b983e36b9ef825a72d230.zip
Merge tag 'v5.2-rc5' into x86/asm, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/ipvlan/ipvlan_core.c')
-rw-r--r--drivers/net/ipvlan/ipvlan_core.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/ipvlan/ipvlan_core.c b/drivers/net/ipvlan/ipvlan_core.c
index e0f5bc82b10c..30cd0c4f0be0 100644
--- a/drivers/net/ipvlan/ipvlan_core.c
+++ b/drivers/net/ipvlan/ipvlan_core.c
@@ -1,10 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/* Copyright (c) 2014 Mahesh Bandewar <maheshb@google.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
*/
#include "ipvlan.h"
OpenPOWER on IntegriCloud