diff options
| author | Greg Kroah-Hartman | 2019-06-17 11:23:24 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-06-17 11:23:24 +0200 |
| commit | a954e5fb4bc2d401b8fc3b4c7cd316497ff80225 (patch) | |
| tree | 06af23b232c7c2e795a2fef8a5a0604ec64d5092 /drivers/net/ethernet/mediatek/mtk_eth_soc.h | |
| parent | Revert "usb: mtu3: fix up undefined reference to usb_debug_root" (diff) | |
| parent | Linux 5.2-rc5 (diff) | |
| download | kernel-qcow2-linux-a954e5fb4bc2d401b8fc3b4c7cd316497ff80225.tar.gz kernel-qcow2-linux-a954e5fb4bc2d401b8fc3b4c7cd316497ff80225.tar.xz kernel-qcow2-linux-a954e5fb4bc2d401b8fc3b4c7cd316497ff80225.zip | |
Merge 5.2-rc5 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/ethernet/mediatek/mtk_eth_soc.h')
| -rw-r--r-- | drivers/net/ethernet/mediatek/mtk_eth_soc.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.h b/drivers/net/ethernet/mediatek/mtk_eth_soc.h index f7501997cea0..baa85d5601e7 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h @@ -1,11 +1,5 @@ -/* 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. +/* SPDX-License-Identifier: GPL-2.0-only */ +/* * * Copyright (C) 2009-2016 John Crispin <blogic@openwrt.org> * Copyright (C) 2009-2016 Felix Fietkau <nbd@openwrt.org> |