diff options
| author | David S. Miller <davem@davemloft.net> | 2019-06-07 11:00:14 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-06-07 11:00:14 -0700 |
| commit | a6cdeeb16bff89c8486324f53577db058cbe81ba (patch) | |
| tree | de2d38e10f5768bdf1d2902112a4803d0ae767f3 /drivers/scsi/mvsas/mv_94xx.c | |
| parent | 96524ea4be04683bb3ad8ebaedcbe3a6e34302de (diff) | |
| parent | 1e1d926369545ea09c98c6c7f5d109aa4ee0cd0b (diff) | |
| download | lwn-a6cdeeb16bff89c8486324f53577db058cbe81ba.tar.gz lwn-a6cdeeb16bff89c8486324f53577db058cbe81ba.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Some ISDN files that got removed in net-next had some changes
done in mainline, take the removals.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/scsi/mvsas/mv_94xx.c')
| -rw-r--r-- | drivers/scsi/mvsas/mv_94xx.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/drivers/scsi/mvsas/mv_94xx.c b/drivers/scsi/mvsas/mv_94xx.c index 68b5b5f39a03..fc0b8eb68204 100644 --- a/drivers/scsi/mvsas/mv_94xx.c +++ b/drivers/scsi/mvsas/mv_94xx.c @@ -1,26 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Marvell 88SE94xx hardware specific * * Copyright 2007 Red Hat, Inc. * Copyright 2008 Marvell. <kewei@marvell.com> * Copyright 2009-2011 Marvell. <yuxiangl@marvell.com> - * - * This file is licensed under GPLv2. - * - * 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; version 2 of the - * License. - * - * 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. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA */ #include "mv_sas.h" |