drivers/net/ethernet/xilinx/axi ethernet: Correct Copyright

Also fix MAINTAINERS file to reflect autorship.

Daniel and Ariane changed coding style but not any functional changes in the driver
itself.

Signed-off-by: Michal Simek <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

diff --git a/MAINTAINERS b/MAINTAINERS
index 32671e00800dd6d9c94eebed48e8ec8b870fcc7d..7cef7be8f840067de262b2e5c3ed1625509106e3 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7577,8 +7577,8 @@ F:        Documentation/filesystems/xfs.txt
 F:     fs/xfs/
 
 XILINX AXI ETHERNET DRIVER
 F:     fs/xfs/
 
 XILINX AXI ETHERNET DRIVER

-M:     Ariane Keller <[email protected]>
-M:     Daniel Borkmann <[email protected]>
+M:     Anirudha Sarangi <[email protected]>
+M:     John Linn <[email protected]>

 S:     Maintained
 F:     drivers/net/ethernet/xilinx/xilinx_axienet*
 
 S:     Maintained
 F:     drivers/net/ethernet/xilinx/xilinx_axienet*
 

diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet.h b/drivers/net/ethernet/xilinx/xilinx_axienet.h
index cc83af083fd7b7b17a650471436ca42e74f8fbe0..44b8d2bad8c3efd09a1d572d2ef7cf36f8d4a227 100644 (file)
--- a/drivers/net/ethernet/xilinx/xilinx_axienet.h
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet.h
@@ -2,9 +2,7 @@
  * Definitions for Xilinx Axi Ethernet device driver.
  *
  * Copyright (c) 2009 Secret Lab Technologies, Ltd.
  * Definitions for Xilinx Axi Ethernet device driver.
  *
  * Copyright (c) 2009 Secret Lab Technologies, Ltd.

- * Copyright (c) 2010 Xilinx, Inc. All rights reserved.
- * Copyright (c) 2012 Daniel Borkmann, <[email protected]>
- * Copyright (c) 2012 Ariane Keller, <[email protected]>
+ * Copyright (c) 2010 - 2012 Xilinx, Inc. All rights reserved.

  */
 
 #ifndef XILINX_AXIENET_H
  */
 
 #ifndef XILINX_AXIENET_H

diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
index 2fcbeba6814bead15acdae0feff0e3e264c5656d..9c365e192a3197dc11267f37ce572985c12f274b 100644 (file)
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -4,9 +4,9 @@
  * Copyright (c) 2008 Nissin Systems Co., Ltd.,  Yoshio Kashiwagi
  * Copyright (c) 2005-2008 DLA Systems,  David H. Lynch Jr. <[email protected]>
  * Copyright (c) 2008-2009 Secret Lab Technologies Ltd.
  * Copyright (c) 2008 Nissin Systems Co., Ltd.,  Yoshio Kashiwagi
  * Copyright (c) 2005-2008 DLA Systems,  David H. Lynch Jr. <[email protected]>
  * Copyright (c) 2008-2009 Secret Lab Technologies Ltd.

- * Copyright (c) 2010 Xilinx, Inc. All rights reserved.
- * Copyright (c) 2012 Daniel Borkmann, <[email protected]>
- * Copyright (c) 2012 Ariane Keller, <[email protected]>
+ * Copyright (c) 2010 - 2011 Michal Simek <[email protected]>
+ * Copyright (c) 2010 - 2011 PetaLogix
+ * Copyright (c) 2010 - 2012 Xilinx, Inc. All rights reserved.

  *
  * This is a driver for the Xilinx Axi Ethernet which is used in the Virtex6
  * and Spartan6.
  *
  * This is a driver for the Xilinx Axi Ethernet which is used in the Virtex6
  * and Spartan6.

diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c b/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c
index d70b6e79f6c0cd4a9236a67a1dcd8b67f327aeb3..e90e1f46121ef2e0fcacc1a1b3ec5b198b2df94d 100644 (file)
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c
@@ -2,9 +2,9 @@
  * MDIO bus driver for the Xilinx Axi Ethernet device
  *
  * Copyright (c) 2009 Secret Lab Technologies, Ltd.
  * MDIO bus driver for the Xilinx Axi Ethernet device
  *
  * Copyright (c) 2009 Secret Lab Technologies, Ltd.

- * Copyright (c) 2010 Xilinx, Inc. All rights reserved.
- * Copyright (c) 2012 Daniel Borkmann, <[email protected]>
- * Copyright (c) 2012 Ariane Keller, <[email protected]>
+ * Copyright (c) 2010 - 2011 Michal Simek <[email protected]>
+ * Copyright (c) 2010 - 2011 PetaLogix
+ * Copyright (c) 2010 - 2012 Xilinx, Inc. All rights reserved.

  */
 
 #include <linux/of_address.h>
  */
 
 #include <linux/of_address.h>