linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] mwifiex: change license text of Makefile and README from MARVELL to NXP
@ 2020-12-01  9:18 Ganapathi Bhat
  2020-12-07 16:34 ` Kalle Valo
  0 siblings, 1 reply; 2+ messages in thread
From: Ganapathi Bhat @ 2020-12-01  9:18 UTC (permalink / raw)
  To: linux-wireless; +Cc: Cathy Luo, James Cao, Rakesh Parmar, Ganapathi Bhat

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(-)

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.,
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] mwifiex: change license text of Makefile and README from MARVELL to NXP
  2020-12-01  9:18 [PATCH] mwifiex: change license text of Makefile and README from MARVELL to NXP Ganapathi Bhat
@ 2020-12-07 16:34 ` Kalle Valo
  0 siblings, 0 replies; 2+ messages in thread
From: Kalle Valo @ 2020-12-07 16:34 UTC (permalink / raw)
  To: Ganapathi Bhat
  Cc: linux-wireless, Cathy Luo, James Cao, Rakesh Parmar,
	Ganapathi Bhat

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

-- 
https://patchwork.kernel.org/project/linux-wireless/patch/1606814307-32715-1-git-send-email-ganapathi.bhat@nxp.com/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-12-07 16:35 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-01  9:18 [PATCH] mwifiex: change license text of Makefile and README from MARVELL to NXP Ganapathi Bhat
2020-12-07 16:34 ` Kalle Valo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).