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/st/cw1200/pm.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/st/cw1200/pm.h')
-rw-r--r-- | drivers/net/wireless/st/cw1200/pm.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/wireless/st/cw1200/pm.h b/drivers/net/wireless/st/cw1200/pm.h index 534548470ebc..f516eedfe03c 100644 --- a/drivers/net/wireless/st/cw1200/pm.h +++ b/drivers/net/wireless/st/cw1200/pm.h @@ -1,12 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Mac80211 power management interface for ST-Ericsson CW1200 mac80211 drivers * * Copyright (c) 2011, ST-Ericsson * Author: Dmitry Tarnyagin <dmitry.tarnyagin@lockless.no> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. */ #ifndef PM_H_INCLUDED |