| Message ID | 1606814307-32715-1-git-send-email-ganapathi.bhat@nxp.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 5f27b9afe8e201c7378d32751d1d8c386a1b64eb |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | mwifiex: change license text of Makefile and README from MARVELL to NXP | expand |
Ganapathi Bhat <ganapathi.bhat@nxp.com> wrote: > As of 6-DEC-2019, NXP has acquired Marvell’s Wireless business > unit. This change is to update the license text accordingly. > > commit 932183aa35c6 ("mwifiex: change license text from MARVELL > to NXP") does this, but it left out two files. > > Signed-off-by: James Cao <zheng.cao@nxp.com> > Signed-off-by: Cathy Luo <xiaohua.luo@nxp.com> > Signed-off-by: Ganapathi Bhat <ganapathi.bhat@nxp.com> Patch applied to wireless-drivers-next.git, thanks. 5f27b9afe8e2 mwifiex: change license text of Makefile and README from MARVELL to NXP
diff --git a/drivers/net/wireless/marvell/mwifiex/Makefile b/drivers/net/wireless/marvell/mwifiex/Makefile index fdfd9bf..162d557 100644 --- a/drivers/net/wireless/marvell/mwifiex/Makefile +++ b/drivers/net/wireless/marvell/mwifiex/Makefile @@ -1,8 +1,8 @@ # -# Copyright (C) 2011-2014, Marvell International Ltd. +# Copyright 2011-2020 NXP # -# This software file (the "File") is distributed by Marvell International -# Ltd. under the terms of the GNU General Public License Version 2, June 1991 +# This software file (the "File") is distributed by NXP +# under the terms of the GNU General Public License Version 2, June 1991 # (the "License"). You may use, redistribute and/or modify this File in # accordance with the terms and conditions of the License, a copy of which # is available by writing to the Free Software Foundation, Inc., diff --git a/drivers/net/wireless/marvell/mwifiex/README b/drivers/net/wireless/marvell/mwifiex/README index 588fcbe..5e39248 100644 --- a/drivers/net/wireless/marvell/mwifiex/README +++ b/drivers/net/wireless/marvell/mwifiex/README @@ -1,7 +1,8 @@ -# Copyright (C) 2011-2014, Marvell International Ltd. # -# This software file (the "File") is distributed by Marvell International -# Ltd. under the terms of the GNU General Public License Version 2, June 1991 +# Copyright 2011-2020 NXP +# +# This software file (the "File") is distributed by NXP +# under the terms of the GNU General Public License Version 2, June 1991 # (the "License"). You may use, redistribute and/or modify this File in # accordance with the terms and conditions of the License, a copy of which # is available by writing to the Free Software Foundation, Inc.,
As of 6-DEC-2019, NXP has acquired Marvell’s Wireless business unit. This change is to update the license text accordingly. commit 932183aa35c6 ("mwifiex: change license text from MARVELL to NXP") does this, but it left out two files. Signed-off-by: James Cao <zheng.cao@nxp.com> Signed-off-by: Cathy Luo <xiaohua.luo@nxp.com> Signed-off-by: Ganapathi Bhat <ganapathi.bhat@nxp.com> --- drivers/net/wireless/marvell/mwifiex/Makefile | 6 +++--- drivers/net/wireless/marvell/mwifiex/README | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-)