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/wireless/intel/ipw2x00/ipw2100.h | |
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/wireless/intel/ipw2x00/ipw2100.h')
-rw-r--r-- | drivers/net/wireless/intel/ipw2x00/ipw2100.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2100.h b/drivers/net/wireless/intel/ipw2x00/ipw2100.h index 8c11c7fa2eef..b34085ade3aa 100644 --- a/drivers/net/wireless/intel/ipw2x00/ipw2100.h +++ b/drivers/net/wireless/intel/ipw2x00/ipw2100.h @@ -1,22 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /****************************************************************************** Copyright(c) 2003 - 2006 Intel Corporation. All rights reserved. - This program is free software; you can redistribute it and/or modify it - under the terms of 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. - - 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. - - The full GNU General Public License is included in this distribution in the - file called LICENSE. Contact Information: Intel Linux Wireless <ilw@linux.intel.com> |