diff options
| author | Ingo Molnar | 2019-06-24 19:19:53 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2019-06-24 19:19:53 +0200 |
| commit | d2abae71ebcc409828b24ce9da402548ecdf1311 (patch) | |
| tree | 5edfafc2828d3bcebb3698520ccba374cd4328c0 /drivers/net/can/sja1000/peak_pci.c | |
| parent | sched/fair: Don't push cfs_bandwith slack timers forward (diff) | |
| parent | Linux 5.2-rc6 (diff) | |
| download | kernel-qcow2-linux-d2abae71ebcc409828b24ce9da402548ecdf1311.tar.gz kernel-qcow2-linux-d2abae71ebcc409828b24ce9da402548ecdf1311.tar.xz kernel-qcow2-linux-d2abae71ebcc409828b24ce9da402548ecdf1311.zip | |
Merge tag 'v5.2-rc6' into sched/core, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/can/sja1000/peak_pci.c')
| -rw-r--r-- | drivers/net/can/sja1000/peak_pci.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/net/can/sja1000/peak_pci.c b/drivers/net/can/sja1000/peak_pci.c index a97b81d1d0da..68366d57916c 100644 --- a/drivers/net/can/sja1000/peak_pci.c +++ b/drivers/net/can/sja1000/peak_pci.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2007, 2011 Wolfgang Grandegger <wg@grandegger.com> * Copyright (C) 2012 Stephane Grosjean <s.grosjean@peak-system.com> @@ -5,15 +6,6 @@ * Derived from the PCAN project file driver/src/pcan_pci.c: * * Copyright (C) 2001-2006 PEAK System-Technik GmbH - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the 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. */ #include <linux/kernel.h> |