diff options
author | David S. Miller | 2019-06-07 20:00:14 +0200 |
---|---|---|
committer | David S. Miller | 2019-06-07 20:00:14 +0200 |
commit | a6cdeeb16bff89c8486324f53577db058cbe81ba (patch) | |
tree | de2d38e10f5768bdf1d2902112a4803d0ae767f3 /drivers/block/rsxx/core.c | |
parent | Merge branch 'Xilinx-axienet-driver-updates' (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
download | kernel-qcow2-linux-a6cdeeb16bff89c8486324f53577db058cbe81ba.tar.gz kernel-qcow2-linux-a6cdeeb16bff89c8486324f53577db058cbe81ba.tar.xz kernel-qcow2-linux-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/block/rsxx/core.c')
-rw-r--r-- | drivers/block/rsxx/core.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/block/rsxx/core.c b/drivers/block/rsxx/core.c index 898d522e8338..de9b2d2f8654 100644 --- a/drivers/block/rsxx/core.c +++ b/drivers/block/rsxx/core.c @@ -1,25 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Filename: core.c * -* * Authors: Joshua Morris <josh.h.morris@us.ibm.com> * Philip Kelleher <pjk1939@linux.vnet.ibm.com> * * (C) Copyright 2013 IBM Corporation -* -* 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. -* -* 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 <linux/kernel.h> |