diff options
| author | David S. Miller <[email protected]> | 2019-06-18 02:48:13 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2019-06-18 03:20:36 +0000 |
| commit | 13091aa30535b719e269f20a7bc34002bf5afae5 (patch) | |
| tree | bd17956c3ce606a119fadbd43bfa1c0c10006984 /drivers/scsi/BusLogic.c | |
| parent | Merge branch 'UDP-GSO-audit-tests' (diff) | |
| parent | Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs (diff) | |
| download | kernel-13091aa30535b719e269f20a7bc34002bf5afae5.tar.gz kernel-13091aa30535b719e269f20a7bc34002bf5afae5.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Honestly all the conflicts were simple overlapping changes,
nothing really interesting to report.
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'drivers/scsi/BusLogic.c')
| -rw-r--r-- | drivers/scsi/BusLogic.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/scsi/BusLogic.c b/drivers/scsi/BusLogic.c index e41e51f1da71..c25e8a54e869 100644 --- a/drivers/scsi/BusLogic.c +++ b/drivers/scsi/BusLogic.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* @@ -5,14 +6,6 @@ Copyright 1995-1998 by Leonard N. Zubkoff <[email protected]> - This program is free software; you may redistribute and/or modify it under - the terms of the GNU General Public License Version 2 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 complete details. The author respectfully requests that any modifications to this software be sent directly to him for evaluation and testing. |