diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-06-17 12:00:22 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-06-17 12:00:22 +0200 |
| commit | 7b347ad4938ddca1a22b983e36b9ef825a72d230 (patch) | |
| tree | 93b6262da516cda28465a8dc0c4a6a95525cbbd8 /drivers/net/can/grcan.c | |
| parent | 9db9b76767f133d0e1ce19f01117c83221641899 (diff) | |
| parent | 9e0babf2c06c73cda2c0cd37a1653d823adb40ec (diff) | |
| download | talos-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/can/grcan.c')
| -rw-r--r-- | drivers/net/can/grcan.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/can/grcan.c b/drivers/net/can/grcan.c index 7eec1d9f86a0..b8f1f2b69dd3 100644 --- a/drivers/net/can/grcan.c +++ b/drivers/net/can/grcan.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Socket CAN driver for Aeroflex Gaisler GRCAN and GRHCAN. * @@ -18,11 +19,6 @@ * See "Documentation/admin-guide/kernel-parameters.rst" for information on the module * parameters. * - * 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. - * * Contributors: Andreas Larsson <andreas@gaisler.com> */ |
