summaryrefslogtreecommitdiff
path: root/net/dsa/master.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2019-06-03 11:56:35 +0200
committerIngo Molnar <mingo@kernel.org>2019-06-03 11:56:35 +0200
commitf7b6a8b30cedaa64ba18d80f1fb3404274281639 (patch)
tree13937ba94eed328bb19b1ccf343cca35446b878b /net/dsa/master.c
parentb33fb3cf6f5e039dea4a85a708a2c86f8a323575 (diff)
parentf2c7c76c5d0a443053e94adb9f0918fa2fb85c3a (diff)
Merge tag 'v5.2-rc3' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/dsa/master.c')
-rw-r--r--net/dsa/master.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/net/dsa/master.c b/net/dsa/master.c
index c58f33931be18..4b52f8bac5e1d 100644
--- a/net/dsa/master.c
+++ b/net/dsa/master.c
@@ -1,13 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Handling of a master device, switching frames via its switch fabric CPU port
*
* Copyright (c) 2017 Savoir-faire Linux Inc.
* Vivien Didelot <vivien.didelot@savoirfairelinux.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 "dsa_priv.h"