From ca7a8e85262e93065b2a49dfb96a24d4a534a049 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Wed, 30 Mar 2011 03:47:06 -0700 Subject: 3c*/acenic/typhoon: Move 3Com Ethernet drivers Moves the 3Com drivers into drivers/net/ethernet/3com/ and the necessary Kconfig and Makefile changes. Did not move the following drivers becuase they use a non-3Com chipset: 3c503, 3c505, 3c507, 3c523 and 3c527 CC: Steffen Klassert CC: David Dillow CC: Jes Sorensen CC: Alan Cox CC: David Hinds Signed-off-by: Jeff Kirsher Acked-by: David Dillow --- MAINTAINERS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 51d42fbc8dc..112e22696a7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -124,13 +124,13 @@ M: Steffen Klassert L: netdev@vger.kernel.org S: Maintained F: Documentation/networking/vortex.txt -F: drivers/net/3c59x.c +F: drivers/net/ethernet/3com/3c59x.c 3CR990 NETWORK DRIVER M: David Dillow L: netdev@vger.kernel.org S: Maintained -F: drivers/net/typhoon* +F: drivers/net/ethernet/3com/typhoon* 3WARE SAS/SATA-RAID SCSI DRIVERS (3W-XXXX, 3W-9XXX, 3W-SAS) M: Adam Radford @@ -214,7 +214,7 @@ ACENIC DRIVER M: Jes Sorensen L: linux-acenic@sunsite.dk S: Maintained -F: drivers/net/acenic* +F: drivers/net/ethernet/3com/acenic* ACER ASPIRE ONE TEMPERATURE AND FAN DRIVER M: Peter Feuerer -- cgit v1.2.3 From b955f6ca776f3bab3d1e2c5fb1d247b203cbda14 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Wed, 30 Mar 2011 07:46:36 -0700 Subject: amd: Move AMD (Lance) chipset drivers Moves the drivers for the AMD chipsets into drivers/net/ethernet/amd/ and the necessary Kconfig and Makfile changes. The au1000 (Alchemy) driver was also moved into the same directory even though it is not a "Lance" driver. CC: Peter Maydell CC: Roman Hodek CC: "Maciej W. Rozycki" CC: Donald Becker CC: Sam Creasey CC: Miguel de Icaza CC: Thomas Bogendoerfer CC: Don Fry CC: Geert Uytterhoeven CC: Russell King CC: David Davies CC: "M.Hipp" CC: Pete Popov CC: David Hinds CC: "Roger C. Pao" Signed-off-by: Jeff Kirsher --- MAINTAINERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 112e22696a7..6f9dc946fc9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -746,7 +746,7 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) W: http://www.arm.linux.org.uk/ S: Maintained F: arch/arm/mach-ebsa110/ -F: drivers/net/arm/am79c961a.* +F: drivers/net/ethernet/amd/am79c961a.* ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6) M: Daniel Ribeiro @@ -4941,7 +4941,7 @@ PCNET32 NETWORK DRIVER M: Don Fry L: netdev@vger.kernel.org S: Maintained -F: drivers/net/pcnet32.c +F: drivers/net/ethernet/amd/pcnet32.c PCRYPT PARALLEL CRYPTO ENGINE M: Steffen Klassert -- cgit v1.2.3 From 644570b830266ff33ff5f3542b9c838f93a55ea6 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Sat, 2 Apr 2011 06:20:12 -0700 Subject: 8390: Move the 8390 related drivers Moves the drivers for the National Semi-conductor 8390 chipset into drivers/net/ethernet/8390/ and the necessary Kconfig and Makefile changes. CC: Donald Becker CC: Paul Gortmaker CC: Alain Malek CC: Peter De Schrijver CC: "David Huggins-Daines" CC: Wim Dumon CC: Yoshinori Sato CC: David Hinds CC: Russell King Signed-off-by: Jeff Kirsher --- MAINTAINERS | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 6f9dc946fc9..c6945830ea4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -170,8 +170,7 @@ F: include/linux/serial_8250.h 8390 NETWORK DRIVERS [WD80x3/SMC-ELITE, SMC-ULTRA, NE2000, 3C503, etc.] L: netdev@vger.kernel.org S: Orphan / Obsolete -F: drivers/net/*8390* -F: drivers/net/ax88796.c +F: drivers/net/ethernet/8390/ 9P FILE SYSTEM M: Eric Van Hensbergen @@ -6568,7 +6567,7 @@ W: http://uclinux-h8.sourceforge.jp/ S: Supported F: arch/h8300/ F: drivers/ide/ide-h8300.c -F: drivers/net/ne-h8300.c +F: drivers/net/ethernet/8390/ne-h8300.c UDF FILESYSTEM M: Jan Kara -- cgit v1.2.3 From adfc5217e9db68d3f0cec8dd847c1a6d3ab549ee Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Thu, 7 Apr 2011 06:03:04 -0700 Subject: broadcom: Move the Broadcom drivers Moves the drivers for Broadcom devices into drivers/net/ethernet/broadcom/ and the necessary Kconfig and Makefile changes. CC: Eilon Greenstein CC: Michael Chan CC: Matt Carlson CC: Gary Zambrano CC: "Maciej W. Rozycki" Signed-off-by: Jeff Kirsher --- MAINTAINERS | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index c6945830ea4..af9de64d89a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1526,27 +1526,27 @@ BROADCOM B44 10/100 ETHERNET DRIVER M: Gary Zambrano L: netdev@vger.kernel.org S: Supported -F: drivers/net/b44.* +F: drivers/net/ethernet/broadcom/b44.* BROADCOM BNX2 GIGABIT ETHERNET DRIVER M: Michael Chan L: netdev@vger.kernel.org S: Supported -F: drivers/net/bnx2.* -F: drivers/net/bnx2_* +F: drivers/net/ethernet/broadcom/bnx2.* +F: drivers/net/ethernet/broadcom/bnx2_* BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER M: Eilon Greenstein L: netdev@vger.kernel.org S: Supported -F: drivers/net/bnx2x/ +F: drivers/net/ethernet/broadcom/bnx2x/ BROADCOM TG3 GIGABIT ETHERNET DRIVER M: Matt Carlson M: Michael Chan L: netdev@vger.kernel.org S: Supported -F: drivers/net/tg3.* +F: drivers/net/ethernet/broadcom/tg3.* BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER M: Brett Rudley -- cgit v1.2.3 From f7917c009c28c941ba151ee66f04dc7f6a2e1e0b Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Thu, 7 Apr 2011 06:57:17 -0700 Subject: chelsio: Move the Chelsio drivers Moves the drivers for the Chelsio chipsets into drivers/net/ethernet/chelsio/ and the necessary Kconfig and Makefile changes. CC: Divy Le Ray CC: Dimitris Michailidis CC: Casey Leedom Signed-off-by: Jeff Kirsher --- MAINTAINERS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index af9de64d89a..0853d00c7d4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1994,7 +1994,7 @@ M: Divy Le Ray L: netdev@vger.kernel.org W: http://www.chelsio.com S: Supported -F: drivers/net/cxgb3/ +F: drivers/net/ethernet/chelsio/cxgb3/ CXGB3 IWARP RNIC DRIVER (IW_CXGB3) M: Steve Wise @@ -2008,7 +2008,7 @@ M: Dimitris Michailidis L: netdev@vger.kernel.org W: http://www.chelsio.com S: Supported -F: drivers/net/cxgb4/ +F: drivers/net/ethernet/chelsio/cxgb4/ CXGB4 IWARP RNIC DRIVER (IW_CXGB4) M: Steve Wise @@ -2022,7 +2022,7 @@ M: Casey Leedom L: netdev@vger.kernel.org W: http://www.chelsio.com S: Supported -F: drivers/net/cxgb4vf/ +F: drivers/net/ethernet/chelsio/cxgb4vf/ STMMAC ETHERNET DRIVER M: Giuseppe Cavallaro -- cgit v1.2.3 From dee1ad47f2ee75f5146d83ca757c1b7861c34c3b Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Thu, 7 Apr 2011 07:42:33 -0700 Subject: intel: Move the Intel wired LAN drivers Moves the Intel wired LAN drivers into drivers/net/ethernet/intel/ and the necessary Kconfig and Makefile changes. Signed-off-by: Jeff Kirsher --- MAINTAINERS | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 0853d00c7d4..f4838da520c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3340,13 +3340,13 @@ M: Bruce Allan M: Carolyn Wyborny M: Don Skidmore M: Greg Rose -M: PJ Waskiewicz +M: Peter P Waskiewicz Jr M: Alex Duyck M: John Ronciak L: e1000-devel@lists.sourceforge.net W: http://e1000.sourceforge.net/ -T: git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-2.6.git -T: git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next-2.6.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next.git S: Supported F: Documentation/networking/e100.txt F: Documentation/networking/e1000.txt @@ -3356,14 +3356,7 @@ F: Documentation/networking/igbvf.txt F: Documentation/networking/ixgb.txt F: Documentation/networking/ixgbe.txt F: Documentation/networking/ixgbevf.txt -F: drivers/net/e100.c -F: drivers/net/e1000/ -F: drivers/net/e1000e/ -F: drivers/net/igb/ -F: drivers/net/igbvf/ -F: drivers/net/ixgb/ -F: drivers/net/ixgbe/ -F: drivers/net/ixgbevf/ +F: drivers/net/ethernet/intel/ INTEL MRST PMU DRIVER M: Len Brown -- cgit v1.2.3 From aa43c2158d5ae1dc76cccb08cd57a3ffd32c3825 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Fri, 8 Apr 2011 19:06:30 -0700 Subject: qlogic: Move the QLogic drivers Moves the QLogic drivers into drivers/net/ethernet/qlogic/ and the necessary Kconfig and Makefile changes. CC: Ron Mercer CC: Amit Kumar Salecha CC: Anirban Chakraborty Signed-off-by: Jeff Kirsher Acked-by: Anirban Chakraborty --- MAINTAINERS | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index f4838da520c..8f2821c3082 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4499,7 +4499,7 @@ M: Amit Kumar Salecha L: netdev@vger.kernel.org W: http://www.qlogic.com S: Supported -F: drivers/net/netxen/ +F: drivers/net/ethernet/qlogic/netxen/ NFS, SUNRPC, AND LOCKD CLIENTS M: Trond Myklebust @@ -5245,7 +5245,7 @@ M: linux-driver@qlogic.com L: netdev@vger.kernel.org S: Supported F: Documentation/networking/LICENSE.qla3xxx -F: drivers/net/qla3xxx.* +F: drivers/net/ethernet/qlogic/qla3xxx.* QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER M: Amit Kumar Salecha @@ -5253,7 +5253,7 @@ M: Anirban Chakraborty M: linux-driver@qlogic.com L: netdev@vger.kernel.org S: Supported -F: drivers/net/qlcnic/ +F: drivers/net/ethernet/qlogic/qlcnic/ QLOGIC QLGE 10Gb ETHERNET DRIVER M: Jitendra Kalsaria @@ -5261,7 +5261,7 @@ M: Ron Mercer M: linux-driver@qlogic.com L: netdev@vger.kernel.org S: Supported -F: drivers/net/qlge/ +F: drivers/net/ethernet/qlogic/qlge/ QNX4 FILESYSTEM M: Anders Larsen -- cgit v1.2.3 From ae150435b59e68de00546330241727f2fec54517 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Thu, 12 May 2011 20:21:07 -0700 Subject: smsc: Move the SMC (SMSC) drivers Moves the SMC (SMSC) drivers into drivers/net/ethernet/smsc/ and the necessary Kconfig and Makefile changes. Also did some cleanup of NET_VENDOR_SMC Kconfig tag for the 8390 based drivers. CC: Nicolas Pitre CC: Donald Becker CC: Erik Stahlman CC: Dustin McIntire CC: Steve Glendinning CC: David Hinds Signed-off-by: Jeff Kirsher --- MAINTAINERS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 8f2821c3082..7c0294cdf9f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5869,7 +5869,7 @@ F: mm/sl?b.c SMC91x ETHERNET DRIVER M: Nicolas Pitre S: Odd Fixes -F: drivers/net/smc91x.* +F: drivers/net/ethernet/smsc/smc91x.* SMM665 HARDWARE MONITOR DRIVER M: Guenter Roeck @@ -5904,13 +5904,13 @@ M: Steve Glendinning L: netdev@vger.kernel.org S: Supported F: include/linux/smsc911x.h -F: drivers/net/smsc911x.* +F: drivers/net/ethernet/smsc/smsc911x.* SMSC9420 PCI ETHERNET DRIVER M: Steve Glendinning L: netdev@vger.kernel.org S: Supported -F: drivers/net/smsc9420.* +F: drivers/net/ethernet/smsc/smsc9420.* SN-IA64 (Itanium) SUB-PLATFORM M: Jes Sorensen -- cgit v1.2.3 From 115978859272b958366d4a08c99a24f9625fa663 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Wed, 13 Jul 2011 15:38:08 -0700 Subject: i825xx: Move the Intel 82586/82593/82596 based drivers Move the drivers that use the i82586/i82593/i82596 chipsets into drivers/net/ethernet/i825xx/ and make the necessary Kconfig and Makefile changes. There were 4 3Com drivers which were initially moved into 3com/, which now reside in i825xx since they all used the i82586 chip. CC: Philip Blundell CC: Russell King CC: CC: Donald Becker CC: Chris Beauregard CC: Richard Procter CC: Andries Brouwer CC: "M.Hipp" CC: Richard Hirst CC: Sam Creasey CC: Thomas Bogendoerfer Signed-off-by: Jeff Kirsher --- MAINTAINERS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 7c0294cdf9f..5b368ccf757 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -117,7 +117,7 @@ Maintainers List (try to look for most precise areas first) M: Philip Blundell L: netdev@vger.kernel.org S: Maintained -F: drivers/net/3c505* +F: drivers/net/ethernet/i825xx/3c505* 3C59X NETWORK DRIVER M: Steffen Klassert @@ -1014,7 +1014,7 @@ F: arch/arm/include/asm/hardware/ioc.h F: arch/arm/include/asm/hardware/iomd.h F: arch/arm/include/asm/hardware/memc.h F: arch/arm/mach-rpc/ -F: drivers/net/arm/ether* +F: drivers/net/arm/ether3* F: drivers/scsi/arm/ ARM/SHARK MACHINE SUPPORT @@ -2510,7 +2510,7 @@ ETHEREXPRESS-16 NETWORK DRIVER M: Philip Blundell L: netdev@vger.kernel.org S: Maintained -F: drivers/net/eexpress.* +F: drivers/net/ethernet/i825xx/eexpress.* ETHERNET BRIDGE M: Stephen Hemminger -- cgit v1.2.3 From 8efc91254fda97ee78e2e0b8e016120e664131de Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Thu, 12 May 2011 21:21:33 -0700 Subject: ni5010: Move the Racal-Interlan (Micom) driver Moves the Racal-Interlan driver into drivers/net/ethernet/racal/ and make the necessary Kconfig and Makefile changes. CC: "Jan-Pascal van Best" CC: Andreas Mohr Signed-off-by: Jeff Kirsher --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 5b368ccf757..19bd60deb13 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4520,7 +4520,7 @@ M: Jan-Pascal van Best M: Andreas Mohr L: netdev@vger.kernel.org S: Maintained -F: drivers/net/ni5010.* +F: drivers/net/ethernet/racal/ni5010.* NILFS2 FILESYSTEM M: KONISHI Ryusuke -- cgit v1.2.3 From e689cf4a042772f727450035b102579b0c01bdc7 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Thu, 12 May 2011 23:04:46 -0700 Subject: cassini/niu/sun*: Move the Sun drivers Moves the Sun drivers into drivers/net/ethernet/sun/ and make the necessary Kconfig and Makefile changes. Oliver Hartkopp suggested removing the sun* prefix on the driver names. This type of change I will leave up to the driver maintainers. CC: Sam Creasey CC: Adrian Sun CC: Benjamin Herrenscmidt Signed-off-by: Jeff Kirsher --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 19bd60deb13..1cb72da76e0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6272,6 +6272,7 @@ S: Maintained F: arch/m68k/kernel/*sun3* F: arch/m68k/sun3*/ F: arch/m68k/include/asm/sun3* +F: drivers/net/ethernet/i825xx/sun3* SUPERH M: Paul Mundt -- cgit v1.2.3 From 874aeea5d01cac55c160a4e503e3ddb4db030de7 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Fri, 13 May 2011 00:17:42 -0700 Subject: sfc: Move the Solarflare drivers Moves the Solarflare drivers into drivers/net/ethernet/sfc/ and make the necessary Kconfig and Makefile changes. CC: Steve Hodgson CC: Ben Hutchings Signed-off-by: Jeff Kirsher --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 1cb72da76e0..5a4c8758973 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5754,7 +5754,7 @@ M: Steve Hodgson M: Ben Hutchings L: netdev@vger.kernel.org S: Supported -F: drivers/net/sfc/ +F: drivers/net/ethernet/sfc/ SGI GRU DRIVER M: Jack Steiner -- cgit v1.2.3 From 9aebddd11be42366f89b0296590770c02797aa98 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Fri, 13 May 2011 00:37:27 -0700 Subject: be2net: Move the Emulex driver Moves the Emulex driver into drivers/net/ethernet/emulex/ and make the necessary Kconfig and Makefile changes. CC: Sathya Perla CC: Subbu Seetharaman CC: Ajit Khaparde Signed-off-by: Jeff Kirsher --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 5a4c8758973..7e51969ee05 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5746,7 +5746,7 @@ M: Ajit Khaparde L: netdev@vger.kernel.org W: http://www.emulex.com S: Supported -F: drivers/net/benet/ +F: drivers/net/ethernet/emulex/benet/ SFC NETWORK DRIVER M: Solarflare linux maintainers -- cgit v1.2.3 From f844a0ead401c3ce0f01a8bb4d6cea2f0f6ad863 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Fri, 13 May 2011 01:00:03 -0700 Subject: bna: Move the Brocade driver Moves the Brocade driver into drivers/net/ethernet/brocade/ and make the necessary Kconfig and Makefile changes. CC: Rasesh Mody CC: Debashis Dutt Signed-off-by: Jeff Kirsher --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 7e51969ee05..0613e60fa64 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1576,7 +1576,7 @@ M: Rasesh Mody M: Debashis Dutt L: netdev@vger.kernel.org S: Supported -F: drivers/net/bna/ +F: drivers/net/ethernet/brocade/bna/ BSG (block layer generic sg v4 driver) M: FUJITA Tomonori -- cgit v1.2.3 From 93f7848b77bcf1108879defd32612422ae80d785 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Fri, 13 May 2011 02:24:46 -0700 Subject: myri*: Move the Myricom drivers Move the Myricom drivers into drivers/net/ethernet/myricom/ and make the necessary Kconfig and Makefile changes. CC: Andrew Gallatin CC: Brice Goglin Signed-off-by: Jeff Kirsher --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 0613e60fa64..0a5ae236bef 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4335,7 +4335,7 @@ M: Andrew Gallatin L: netdev@vger.kernel.org W: http://www.myri.com/scs/download-Myri10GE.html S: Supported -F: drivers/net/myri10ge/ +F: drivers/net/ethernet/myricom/myri10ge/ NATSEMI ETHERNET DRIVER (DP8381x) M: Tim Hockin -- cgit v1.2.3 From 86387e1ac4fcaa45ff5578013a78593d1a0ba279 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Fri, 13 May 2011 02:51:01 -0700 Subject: s2io/vxge: Move the Exar drivers Move the Exar drivers into drivers/net/ethernet/neterion/ and make the necessary Kconfig and Makefile changes. CC: Jon Mason Signed-off-by: Jeff Kirsher --- MAINTAINERS | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 0a5ae236bef..bcfc144e96a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4380,9 +4380,8 @@ W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/Linux?Anonymous W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/X3100Linux?Anonymous S: Supported F: Documentation/networking/s2io.txt -F: drivers/net/s2io* F: Documentation/networking/vxge.txt -F: drivers/net/vxge/ +F: drivers/net/ethernet/neterion/ NETFILTER/IPTABLES/IPCHAINS P: Rusty Russell -- cgit v1.2.3 From 9aa3283595451ca093500ff0977b106e1f465586 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Fri, 13 May 2011 14:29:12 -0700 Subject: ehea/ibm*: Move the IBM drivers Move the IBM drivers into drivers/net/ethernet/ibm/ and make the necessary Kconfig and Makefile changes. - Renamed ibm_new_emac to emac - Cleaned up Makefile and Kconfig options which referred to IBM_NEW_EMAC to IBM_EMAC - ibmlana driver is a National Semiconductor SONIC driver so it was not moved CC: Christoph Raisch CC: Santiago Leon CC: Benjamin Herrenschmidt CC: David Gibson CC: Kyle Lucke CC: Michael Ellerman Signed-off-by: Jeff Kirsher --- MAINTAINERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index bcfc144e96a..2fcfa8b02d9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2465,7 +2465,7 @@ EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER M: Breno Leitao L: netdev@vger.kernel.org S: Maintained -F: drivers/net/ehea/ +F: drivers/net/ethernet/ibm/ehea/ EMBEDDED LINUX M: Paul Gortmaker @@ -3163,7 +3163,7 @@ IBM Power Virtual Ethernet Device Driver M: Santiago Leon L: netdev@vger.kernel.org S: Supported -F: drivers/net/ibmveth.* +F: drivers/net/ethernet/ibm/ibmveth.* IBM ServeRAID RAID DRIVER P: Jack Hammer -- cgit v1.2.3 From a6a5580c4d90788d67a77c689d3ab22aa5eecfc3 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Fri, 13 May 2011 22:20:35 -0700 Subject: enic: Move the Cisco driver Move the Cisco driver into drivers/net/ethernet/cisco/ and make the necessary Kconfig and Makefile changes. CC: Christian Benvenuti CC: Vasanthy Kolluri CC: Roopa Prabhu CC: David Wang Signed-off-by: Jeff Kirsher --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 2fcfa8b02d9..c54e736f589 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1761,7 +1761,7 @@ M: Vasanthy Kolluri M: Roopa Prabhu M: David Wang S: Supported -F: drivers/net/enic/ +F: drivers/net/ethernet/cisco/enic/ CIRRUS LOGIC EP93XX ETHERNET DRIVER M: Hartley Sweeten -- cgit v1.2.3 From ded19addf9c937d83b9bfb4d73a836732569041b Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Sun, 15 May 2011 20:56:37 -0700 Subject: pasemic_mac*: Move the PA Semi driver Move the PA Semi driver into drivers/net/ethernet/pasemi/ and make the necessary Kconfig and Makefile changes. CC: Olof Johansson Signed-off-by: Jeff Kirsher Acked-by: Olof Johansson --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index c54e736f589..51ac08b14b4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4785,7 +4785,7 @@ PA SEMI ETHERNET DRIVER M: Olof Johansson L: netdev@vger.kernel.org S: Maintained -F: drivers/net/pasemi_mac.* +F: drivers/net/ethernet/pasemi/* PA SEMI SMBUS DRIVER M: Olof Johansson -- cgit v1.2.3 From ef7f54297df683665145859501f63c801f6c7ea8 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Sun, 15 May 2011 21:46:41 -0700 Subject: tehuti: Move the Tehuti driver Move the Tehuti driver into drivers/net/ethernet/tehuti/ and make the necessary Kconfig and Makefile changes. CC: Alexander Indenbaum CC: Andy Gospodarek Signed-off-by: Jeff Kirsher --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 51ac08b14b4..c789b6fbdd9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6360,7 +6360,7 @@ M: Alexander Indenbaum M: Andy Gospodarek L: netdev@vger.kernel.org S: Supported -F: drivers/net/tehuti* +F: drivers/net/ethernet/tehuti/* Telecom Clock Driver for MCPL0010 M: Mark Gross -- cgit v1.2.3 From 7ac6653a085b41405758bc16b2525db56ee0a23f Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Mon, 16 May 2011 00:05:19 -0700 Subject: stmmac: Move the STMicroelectronics driver Move the STMicroelectronics driver into driver/net/ethernet/stmicro/ and make the necessary Kconfig and Makefile changes. CC: Giuseppe Cavallaro Signed-off-by: Jeff Kirsher --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index c789b6fbdd9..5dffc8ed4af 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2029,7 +2029,7 @@ M: Giuseppe Cavallaro L: netdev@vger.kernel.org W: http://www.stlinux.com S: Supported -F: drivers/net/stmmac/ +F: drivers/net/ethernet/stmicro/stmmac/ CYBERPRO FB DRIVER M: Russell King -- cgit v1.2.3 From d9fb9f384292d848ad9db386bcf97f1e06e60264 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Wed, 18 May 2011 05:14:22 -0700 Subject: *sonic/natsemi/ns83829: Move the National Semi-conductor drivers Move the National Semi-conductor drivers into drivers/net/ethernet/natsemi/ and make the necessary Kconfig and Makefile changes. Also moved the 8390 (National Semi-conductor) devices as a sub-menu of National Semi-conductor devices. - moved the ibmlana driver as well into this directory since it is a "SONIC" driver CC: Alfred Arnold CC: Thomas Bogendoerfer CC: Harald Welte CC: Tim Hockin CC: CC: Kevin Chea CC: Marc Gauthier CC: Chris Zankel Signed-off-by: Jeff Kirsher Acked-by: Marc Gauthier --- MAINTAINERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 5dffc8ed4af..554529d11e9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4340,7 +4340,7 @@ F: drivers/net/ethernet/myricom/myri10ge/ NATSEMI ETHERNET DRIVER (DP8381x) M: Tim Hockin S: Maintained -F: drivers/net/natsemi.c +F: drivers/net/ethernet/natsemi/natsemi.c NATIVE INSTRUMENTS USB SOUND INTERFACE DRIVER M: Daniel Mack @@ -5943,7 +5943,7 @@ SONIC NETWORK DRIVER M: Thomas Bogendoerfer L: netdev@vger.kernel.org S: Maintained -F: drivers/net/sonic.* +F: drivers/net/ethernet/natsemi/sonic.* SONICS SILICON BACKPLANE DRIVER (SSB) M: Michael Buesch -- cgit v1.2.3 From b47da97728c045a8fd75f36e59ba08cddc8f2292 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Thu, 14 Jul 2011 22:13:23 -0700 Subject: xscale: Move the Intel XScale IXP drivers Move the Intel XScale IXP drivers into drivers/net/ethernet/xscale/ and make the necessary Kconfig and Makefile changes. CC: Krzysztof Halasa CC: Lennert Buytenhek Signed-off-by: Jeff Kirsher --- MAINTAINERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 554529d11e9..39607a99f96 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3319,7 +3319,7 @@ F: arch/arm/mach-ixp4xx/include/mach/qmgr.h F: arch/arm/mach-ixp4xx/include/mach/npe.h F: arch/arm/mach-ixp4xx/ixp4xx_qmgr.c F: arch/arm/mach-ixp4xx/ixp4xx_npe.c -F: drivers/net/arm/ixp4xx_eth.c +F: drivers/net/ethernet/xscale/ixp4xx_eth.c F: drivers/net/wan/ixp4xx_hss.c INTEL IXP4XX RANDOM NUMBER GENERATOR SUPPORT @@ -3331,7 +3331,7 @@ INTEL IXP2000 ETHERNET DRIVER M: Lennert Buytenhek L: netdev@vger.kernel.org S: Maintained -F: drivers/net/ixp2000/ +F: drivers/net/ethernet/xscale/ixp2000/ INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/igbvf/ixgb/ixgbe/ixgbevf) M: Jeff Kirsher -- cgit v1.2.3 From a8fe65b8f031c5c0a7414059773eaa962e5243cb Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Thu, 19 May 2011 23:27:55 -0700 Subject: 8139*/atp/r8169/sc92031: Move the Realtek drivers Move the Realtek drivers into drivers/net/ethernet/realtek/ and make the necessary Kconfig and Makefile changes. CC: Realtek linux nic maintainers CC: Francois Romieu CC: Jeff Garzik CC: Donald Becker Signed-off-by: Jeff Kirsher --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 39607a99f96..88ff9efa9c6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -156,7 +156,7 @@ M: Realtek linux nic maintainers M: Francois Romieu L: netdev@vger.kernel.org S: Maintained -F: drivers/net/r8169.c +F: drivers/net/ethernet/realtek/r8169.c 8250/16?50 (AND CLONE UARTS) SERIAL DRIVER M: Greg Kroah-Hartman -- cgit v1.2.3 From 2b133ad6e9e96798007e64eb912c42fa00adef0a Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Fri, 20 May 2011 06:55:16 -0700 Subject: atl*: Move the Atheros drivers Move the Atheros drivers into drivers/net/ethernet/atheros/ and make the necessary Kconfig and Makefile changes. CC: Jay Cliburn CC: Chris Snook CC: Jie Yang Signed-off-by: Jeff Kirsher --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 88ff9efa9c6..26fa497e373 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1282,7 +1282,7 @@ L: netdev@vger.kernel.org W: http://sourceforge.net/projects/atl1 W: http://atl1.sourceforge.net S: Maintained -F: drivers/net/atlx/ +F: drivers/net/ethernet/atheros/ ATM M: Chas Williams -- cgit v1.2.3 From a88394cfb58007cca945699545469017beb0d206 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Fri, 20 May 2011 07:15:19 -0700 Subject: ewrk3/tulip: Move the DEC - Tulip drivers Move the DEC - Tulip driver into drivers/net/ethernet/dec/tulip/ and make the necessary Kconfig and Makefile changes. The Digital Equioment (DEC) driver ewrk3 was moved into drivers/net/ethernet/dec/ and the remaining drivers (Tulip) were moved into drivers/net/ethernet/dec/tulip/ CC: Tobias Ringstrom CC: Grant Grundler CC: David Davies Signed-off-by: Jeff Kirsher Acked-by: Grant Grundler --- MAINTAINERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 26fa497e373..fbafbb68ae5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2073,7 +2073,7 @@ DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER L: netdev@vger.kernel.org S: Orphan F: Documentation/networking/dmfe.txt -F: drivers/net/tulip/dmfe.c +F: drivers/net/ethernet/tulip/dmfe.c DC390/AM53C974 SCSI driver M: Kurt Garloff @@ -6514,7 +6514,7 @@ TULIP NETWORK DRIVERS M: Grant Grundler L: netdev@vger.kernel.org S: Maintained -F: drivers/net/tulip/ +F: drivers/net/ethernet/tulip/ TUN/TAP driver M: Maxim Krasnyansky -- cgit v1.2.3 From 8862bf1ed60de49550109b7023a0a33eb7db8b3c Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Fri, 20 May 2011 07:50:27 -0700 Subject: ioc3-eth/meth: Move the SGI drivers Move the SGI drivers into drivers/net/ethernet/sgi/ and make the necessary Kconfig and Makefile changes. CC: Ralf Baechle Signed-off-by: Jeff Kirsher --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index fbafbb68ae5..1bd9fbd2175 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3424,7 +3424,7 @@ IOC3 ETHERNET DRIVER M: Ralf Baechle L: linux-mips@linux-mips.org S: Maintained -F: drivers/net/ioc3-eth.c +F: drivers/net/ethernet/sgi/ioc3-eth.c IOC3 SERIAL DRIVER M: Pat Gefre -- cgit v1.2.3 From 9e13fbf7af3cb044f365e8df9c0e9277715cfc7c Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Fri, 15 Jul 2011 03:18:21 -0700 Subject: seeq: Move the SEEQ drivers Move the drivers that use SEEQ chipset into drivers/net/ethernet/seeq and make the necessary Kconfig and Makefile changes. CC: Russell King CC: Hamish Coleman Signed-off-by: Jeff Kirsher --- MAINTAINERS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 1bd9fbd2175..e986e3e1d2a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1014,7 +1014,8 @@ F: arch/arm/include/asm/hardware/ioc.h F: arch/arm/include/asm/hardware/iomd.h F: arch/arm/include/asm/hardware/memc.h F: arch/arm/mach-rpc/ -F: drivers/net/arm/ether3* +F: drivers/net/ethernet/i825xx/ether1* +F: drivers/net/ethernet/seeq/ether3* F: drivers/scsi/arm/ ARM/SHARK MACHINE SUPPORT -- cgit v1.2.3 From 527a626601de6ff89859de90883cc546892bf3ca Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Fri, 20 May 2011 20:18:55 -0700 Subject: skge/sky2/mv643xx/pxa168: Move the Marvell Ethernet drivers Move the Marvell Ethernet drivers into drivers/net/ethernet/marvell/ and make the necessary Kconfig and Makefile changes. CC: Sachin Sanap CC: Zhangfei Gao CC: Philip Rakity CC: Mark Brown CC: Lennert Buytenhek CC: Stephen Hemminger Signed-off-by: Jeff Kirsher --- MAINTAINERS | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index e986e3e1d2a..b9acfdee10e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4122,7 +4122,7 @@ MARVELL MV643XX ETHERNET DRIVER M: Lennert Buytenhek L: netdev@vger.kernel.org S: Maintained -F: drivers/net/mv643xx_eth.* +F: drivers/net/ethernet/marvell/mv643xx_eth.* F: include/linux/mv643xx.h MARVELL MWIFIEX WIRELESS DRIVER @@ -5854,8 +5854,7 @@ SKGE, SKY2 10/100/1000 GIGABIT ETHERNET DRIVERS M: Stephen Hemminger L: netdev@vger.kernel.org S: Maintained -F: drivers/net/skge.* -F: drivers/net/sky2.* +F: drivers/net/ethernet/marvell/sk* SLAB ALLOCATOR M: Christoph Lameter -- cgit v1.2.3 From f2148a472883ddf77626fff52b070655a8a0a788 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Fri, 20 May 2011 20:43:09 -0700 Subject: via-*: Move the VIA drivers Move the VIA drivers into drivers/net/ethernet/via/ and make the necessary Kconfig and Makefile changes. CC: Roger Luethi CC: Francois Romieu Signed-off-by: Jeff Kirsher --- MAINTAINERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index b9acfdee10e..51d9281a303 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6988,7 +6988,7 @@ F: include/linux/vhost.h VIA RHINE NETWORK DRIVER M: Roger Luethi S: Maintained -F: drivers/net/via-rhine.c +F: drivers/net/ethernet/via/via-rhine.c VIAPRO SMBUS DRIVER M: Jean Delvare @@ -7016,7 +7016,7 @@ VIA VELOCITY NETWORK DRIVER M: Francois Romieu L: netdev@vger.kernel.org S: Maintained -F: drivers/net/via-velocity.* +F: drivers/net/ethernet/via/via-velocity.* VLAN (802.1Q) M: Patrick McHardy -- cgit v1.2.3 From 5346ebf6db077d963e9d81af9df290d7f5532492 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Sat, 11 Jun 2011 01:13:22 -0700 Subject: eth16i: Move the Allied Telesis/Fujitsu drivers Move the Allied Telesis/Fujitsu drivers into drivers/net/ethernet/fujitsu/ and make the necessary Kconfig and Makefile changes. CC: Shingo Fujimoto CC: Yutaka Tamiya CC: Rene Schmit CC: Mika Kuoppala Signed-off-by: Jeff Kirsher --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 51d9281a303..5b2ad6c8cac 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2525,7 +2525,7 @@ F: net/bridge/ ETHERTEAM 16I DRIVER M: Mika Kuoppala S: Maintained -F: drivers/net/eth16i.c +F: drivers/net/ethernet/fujitsu/eth16i.c EXT2 FILE SYSTEM M: Jan Kara -- cgit v1.2.3 From ec21e2ec367697b4803e82662bdff6c8567745fc Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Sat, 11 Jun 2011 02:29:36 -0700 Subject: freescale: Move the Freescale drivers Move the Freescale drivers into drivers/net/ethernet/freescale/ and make the necessary Kconfig and Makefile changes. CC: Sandeep Gopalpet CC: Andy Fleming CC: Shlomi Gridish CC: Li Yang CC: Pantelis Antoniou CC: Vitaly Bordug CC: Dan Malek CC: Sylvain Munaut Signed-off-by: Jeff Kirsher --- MAINTAINERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 5b2ad6c8cac..77ca43046b7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2689,7 +2689,7 @@ M: Vitaly Bordug L: linuxppc-dev@lists.ozlabs.org L: netdev@vger.kernel.org S: Maintained -F: drivers/net/fs_enet/ +F: drivers/net/ethernet/freescale/fs_enet/ F: include/linux/fs_enet_pd.h FREESCALE QUICC ENGINE LIBRARY @@ -2711,7 +2711,7 @@ M: Li Yang L: netdev@vger.kernel.org L: linuxppc-dev@lists.ozlabs.org S: Maintained -F: drivers/net/ucc_geth* +F: drivers/net/ethernet/freescale/ucc_geth* FREESCALE QUICC ENGINE UCC UART DRIVER M: Timur Tabi -- cgit v1.2.3 From 8df158ac36fa0937f51c372f0c2d0ad1b86ebe4c Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Sat, 30 Jul 2011 00:36:02 -0700 Subject: toshiba: Move the Toshiba drivers Move the Toshiba ethernet drivers into drivers/net/ethernet/toshiba and make the necessary Kconfig and Makefile changes. CC: Geoff Levand CC: Jens Osterkamp CC: Ishizaki Kou Signed-off-by: Jeff Kirsher --- MAINTAINERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 77ca43046b7..84948bd44b8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5127,7 +5127,7 @@ M: Geoff Levand L: netdev@vger.kernel.org L: cbe-oss-dev@lists.ozlabs.org S: Maintained -F: drivers/net/ps3_gelic_net.* +F: drivers/net/ethernet/toshiba/ps3_gelic_net.* PS3 PLATFORM SUPPORT M: Geoff Levand @@ -6084,7 +6084,7 @@ M: Jens Osterkamp L: netdev@vger.kernel.org S: Supported F: Documentation/networking/spider_net.txt -F: drivers/net/spider_net* +F: drivers/net/ethernet/toshiba/spider_net* SPU FILE SYSTEM M: Jeremy Kerr -- cgit v1.2.3 From 8c7de408fd2caa11b8b3a1ed8a1b141ce127ad4e Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Mon, 13 Jun 2011 08:43:49 -0700 Subject: sis*: Move the Silicon Integrated Systems (SiS) drivers Move the SiS drivers into drivers/net/ethernet/sis/ and make the necessary Kconfig and Makefile changes CC: Daniele Venzano CC: Francois Romieu Signed-off-by: Jeff Kirsher --- MAINTAINERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 84948bd44b8..96a2d4732e3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5820,14 +5820,14 @@ SIS 190 ETHERNET DRIVER M: Francois Romieu L: netdev@vger.kernel.org S: Maintained -F: drivers/net/sis190.c +F: drivers/net/ethernet/sis/sis190.c SIS 900/7016 FAST ETHERNET DRIVER M: Daniele Venzano W: http://www.brownhat.org/sis900.html L: netdev@vger.kernel.org S: Maintained -F: drivers/net/sis900.* +F: drivers/net/ethernet/sis/sis900.* SIS 96X I2C/SMBUS DRIVER M: "Mark M. Hoffman" -- cgit v1.2.3 From 57d0b7a0d77d0b770682e425ff3fa270c65a4eb5 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Sat, 16 Jul 2011 23:50:52 -0700 Subject: cirrus: Move the Cirrus network driver Move the Cirrus Ethernet driver into drivers/net/ethernet/cirrus/ and make the necessary Kconfig and Makefile changes CC: Hartley Sweeten Signed-off-by: Jeff Kirsher --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 96a2d4732e3..ee4ebb47012 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1768,7 +1768,7 @@ CIRRUS LOGIC EP93XX ETHERNET DRIVER M: Hartley Sweeten L: netdev@vger.kernel.org S: Maintained -F: drivers/net/arm/ep93xx_eth.c +F: drivers/net/ethernet/cirrus/ep93xx_eth.c CIRRUS LOGIC EP93XX OHCI USB HOST DRIVER M: Lennert Buytenhek -- cgit v1.2.3 From 679ec0ef08afde98fd5b2d1aa9fb3e50cce657a0 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Sun, 17 Jul 2011 00:20:45 -0700 Subject: nuvoton: Move the Nuvoton driver Move the Nuvoton driver into drivers/net/ethernet/nuvoton/ and make the necessary Kconfig and Makefile changes. CC: Wan ZongShun Signed-off-by: Jeff Kirsher --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index ee4ebb47012..d31fd9ed526 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1127,7 +1127,7 @@ F: arch/arm/mach-nuc93x/ F: drivers/input/keyboard/w90p910_keypad.c F: drivers/input/touchscreen/w90p910_ts.c F: drivers/watchdog/nuc900_wdt.c -F: drivers/net/arm/w90p910_ether.c +F: drivers/net/ethernet/nuvoton/w90p910_ether.c F: drivers/mtd/nand/nuc900_nand.c F: drivers/rtc/rtc-nuc900.c F: drivers/spi/spi_nuc900.c -- cgit v1.2.3 From b544dbac41218fd015ac79455cfc1e57736e9b0c Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Tue, 14 Jun 2011 12:56:50 -0700 Subject: davinci*/tlan/cpmac: Move the Texas Instruments (TI) drivers Move the Texas Instruments drivers to drivers/net/ethernet/ti/ and make the necessary Kconfig and Makefile changes. CC: Sriram CC: Vinay Hegde CC: Cyril Chemparathy CC: Samuel Chessman CC: CC: Eugene Konev CC: Florian Fainelli Signed-off-by: Jeff Kirsher --- MAINTAINERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index d31fd9ed526..622f4fc7968 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1908,7 +1908,7 @@ CPMAC ETHERNET DRIVER M: Florian Fainelli L: netdev@vger.kernel.org S: Maintained -F: drivers/net/cpmac.c +F: drivers/net/ethernet/ti/cpmac.c CPU FREQUENCY DRIVERS M: Dave Jones @@ -6420,7 +6420,7 @@ L: tlan-devel@lists.sourceforge.net (subscribers-only) W: http://sourceforge.net/projects/tlan/ S: Maintained F: Documentation/networking/tlan.txt -F: drivers/net/tlan.* +F: drivers/net/ethernet/ti/tlan.* TOMOYO SECURITY MODULE M: Kentaro Takeda -- cgit v1.2.3 From 63d24a0eb71b1ec5ed302816379aaf76eecb053c Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Wed, 15 Jun 2011 10:17:58 -0700 Subject: jme: Move the JME driver Move the JME driver into drivers/net/ethernet/ and make the necessary Kconfig and Makefile changes. CC: Guo-Fu Tseng Signed-off-by: Jeff Kirsher --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 622f4fc7968..37cbe1495c6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3591,7 +3591,7 @@ JME NETWORK DRIVER M: Guo-Fu Tseng L: netdev@vger.kernel.org S: Maintained -F: drivers/net/jme.* +F: drivers/net/ethernet/jme.* JOURNALLING FLASH FILE SYSTEM V2 (JFFS2) M: David Woodhouse -- cgit v1.2.3 From 7443713a31f284365454493a9adbaea02bcc4344 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Thu, 16 Jun 2011 15:02:54 -0700 Subject: ipg: Move the IC Plus driver Move the IC Plus driver into drivers/net/ethernet/icplus/ and make the necessary Kconfig and Makefile changes. CC: CC: CC: Signed-off-by: Jeff Kirsher --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 37cbe1495c6..879c17ebf38 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3443,7 +3443,7 @@ M: Francois Romieu M: Sorbica Shieh L: netdev@vger.kernel.org S: Maintained -F: drivers/net/ipg.* +F: drivers/net/ethernet/icplus/ipg.* IPATH DRIVER M: Mike Marciniszyn -- cgit v1.2.3 From 7b35f03338a8557122e62ea1a011f1628b978e8d Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Sat, 18 Jun 2011 00:01:26 -0700 Subject: bfin_mac: Move the Analog Devices Inc driver Move the Analog Devices Inc driver into drivers/net/ethernet/adi/ and make the necessary Kconfig and Makefile changes. CC: Signed-off-by: Jeff Kirsher Acked-by: Bob Liu --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 879c17ebf38..15d70213be5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1446,7 +1446,7 @@ BLACKFIN EMAC DRIVER L: uclinux-dist-devel@blackfin.uclinux.org W: http://blackfin.uclinux.org S: Supported -F: drivers/net/bfin_mac.* +F: drivers/net/ethernet/adi/ BLACKFIN RTC DRIVER M: Mike Frysinger -- cgit v1.2.3 From 9f2f381f813858755f5b6ef7af316feda0726ef3 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Sat, 18 Jun 2011 01:52:36 -0700 Subject: macb: Move the Atmel driver Move the Atmel driver into drivers/net/ethernet/cadence/ and make the necessary Kconfig and Makefile changes. CC: Nicolas Ferre CC: Jamie Iles Signed-off-by: Jeff Kirsher Acked-by: Jamie Iles Acked-by: Nicolas Ferre --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 15d70213be5..ae60f8c7c65 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1323,7 +1323,7 @@ F: include/video/atmel_lcdc.h ATMEL MACB ETHERNET DRIVER M: Nicolas Ferre S: Supported -F: drivers/net/macb.* +F: drivers/net/ethernet/cadence/ ATMEL SPI DRIVER M: Nicolas Ferre -- cgit v1.2.3 From 58565a35eab01eb5fba928af23d31a636d03a056 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Sat, 23 Jul 2011 23:26:01 -0700 Subject: r6040: Move the RDC driver Move the RDC driver into drivers/net/ethernet/rdc/ and make the necessary Kconfig and Makefile changes. CC: Florian Fainelli Signed-off-by: Jeff Kirsher --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index ae60f8c7c65..ca3ec84c4f2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5343,7 +5343,7 @@ RDC R6040 FAST ETHERNET DRIVER M: Florian Fainelli L: netdev@vger.kernel.org S: Maintained -F: drivers/net/r6040.c +F: drivers/net/ethernet/rdc/r6040.c RDS - RELIABLE DATAGRAM SOCKETS M: Andy Grover -- cgit v1.2.3 From 9bba23b0ae933a143f8ea89e59c6becf0c1c1d1e Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Sun, 24 Jul 2011 02:13:24 -0700 Subject: starfire: Move the Adaptec driver Move the Adaptec driver into drivers/net/ethernet/adaptec/ and make the necessary Kconfig and Makefile changes. CC: Ion Badulescu Signed-off-by: Jeff Kirsher --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index ca3ec84c4f2..8ca886e34b7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6262,7 +6262,7 @@ F: drivers/staging/xgifb/ STARFIRE/DURALAN NETWORK DRIVER M: Ion Badulescu S: Odd Fixes -F: drivers/net/starfire* +F: drivers/net/ethernet/adaptec/starfire* SUN3/3X M: Sam Creasey -- cgit v1.2.3 From 7e25d72458c64e6ca76d69ae8da9ba98f1bf9d25 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Sun, 24 Jul 2011 13:19:50 -0700 Subject: hp100: Move the HP driver Move the HP driver into drivers/net/ethernet/hp/ and made the necessary Kconfig and Makefile changes. CC: Jaroslav Kysela Signed-off-by: Jeff Kirsher --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 8ca886e34b7..dfa4269fd4d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3066,7 +3066,7 @@ F: drivers/platform/x86/tc1100-wmi.c HP100: Driver for HP 10/100 Mbit/s Voice Grade Network Adapter Series M: Jaroslav Kysela S: Maintained -F: drivers/net/hp100.* +F: drivers/net/ethernet/hp/hp100.* HPET: High Precision Event Timers driver M: Clemens Ladisch -- cgit v1.2.3 From cdd80bd4eece6109c15864e776b83c88c3bd891b Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Sat, 30 Jul 2011 18:42:56 -0700 Subject: tile: Move the Tilera driver Move the Tilera driver into drivers/net/ethernet/tile and make the necessary Kconfig and Makefile changes. Updated the Kconfig so that the options defualt to y if TILE kernel. CC: Chris Metcalf Signed-off-by: Jeff Kirsher --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index dfa4269fd4d..3d8a6a6d660 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6411,7 +6411,7 @@ W: http://www.tilera.com/scm/ S: Supported F: arch/tile/ F: drivers/tty/hvc/hvc_tile.c -F: drivers/net/tile/ +F: drivers/net/ethernet/tile/ F: drivers/edac/tile_edac.c TLAN NETWORK DRIVER -- cgit v1.2.3 From 531c4f896ca380812c22841e8ae396428a3327bf Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Sat, 13 Aug 2011 00:37:14 -0700 Subject: acenic: Move the Alteon driver Based on feedback from Alan Cox, the acenic driver moved to drivers/net/ethernet/alteon/ and made the necessary Kconfig and Makefile changes. CC: Jes Sorensen CC: Alan Cox Signed-off-by: Jeff Kirsher --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 3d8a6a6d660..d374c6f9d05 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -213,7 +213,7 @@ ACENIC DRIVER M: Jes Sorensen L: linux-acenic@sunsite.dk S: Maintained -F: drivers/net/ethernet/3com/acenic* +F: drivers/net/ethernet/alteon/acenic* ACER ASPIRE ONE TEMPERATURE AND FAN DRIVER M: Peter Feuerer -- cgit v1.2.3 From 83c07ddee839e2d23a04466c92a59aed4d79a30b Mon Sep 17 00:00:00 2001 From: Amit Kumar Salecha Date: Thu, 18 Aug 2011 04:12:32 -0700 Subject: MAINTAINERS: change netxen_nic maintainers I will no longer maintain netxen_nic driver. Sony Chacko and Rajesh Borundia are taking over. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller --- MAINTAINERS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index d374c6f9d05..79edb1cd9e4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4495,7 +4495,8 @@ F: include/linux/if_* F: include/linux/*device.h NETXEN (1/10) GbE SUPPORT -M: Amit Kumar Salecha +M: Sony Chacko +M: Rajesh Borundia L: netdev@vger.kernel.org W: http://www.qlogic.com S: Supported -- cgit v1.2.3 From e987716b4fd78e9f3f135ddf762b601aadb02d92 Mon Sep 17 00:00:00 2001 From: Anirban Chakraborty Date: Thu, 18 Aug 2011 21:31:22 -0700 Subject: MAINTAINERS: qlcnic Signed-off-by: Anirban Chakraborty Signed-off-by: David S. Miller --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 79edb1cd9e4..ea20bd0aef3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5249,8 +5249,8 @@ F: Documentation/networking/LICENSE.qla3xxx F: drivers/net/ethernet/qlogic/qla3xxx.* QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER -M: Amit Kumar Salecha M: Anirban Chakraborty +M: Sony Chacko M: linux-driver@qlogic.com L: netdev@vger.kernel.org S: Supported -- cgit v1.2.3 From b2d2ccffa4593f56a90a4163d54770949a10c936 Mon Sep 17 00:00:00 2001 From: Jitendra Kalsaria Date: Sat, 20 Aug 2011 10:33:34 -0700 Subject: qlge: Adding Maintainer. Signed-off-by: Jitendra Kalsaria Signed-off-by: David S. Miller --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index ea20bd0aef3..fd474a05cba 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5257,6 +5257,7 @@ S: Supported F: drivers/net/ethernet/qlogic/qlcnic/ QLOGIC QLGE 10Gb ETHERNET DRIVER +M: Anirban Chakraborty M: Jitendra Kalsaria M: Ron Mercer M: linux-driver@qlogic.com -- cgit v1.2.3 From 6423d30f030b560ef1b701bb1f205c3817efe380 Mon Sep 17 00:00:00 2001 From: Aloisio Almeida Jr Date: Fri, 19 Aug 2011 16:09:49 -0300 Subject: MAINTAINERS: Add NFC subsystem entry Update MAINTAINERS with NFC subsystem and drivers entry. Signed-off-by: Aloisio Almeida Jr Signed-off-by: John W. Linville --- MAINTAINERS | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 1d2e79db0f5..4771368eb74 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4492,6 +4492,17 @@ W: http://www.qlogic.com S: Supported F: drivers/net/netxen/ +NFC SUBSYSTEM +M: Lauro Ramos Venancio +M: Aloisio Almeida Jr +M: Samuel Ortiz +L: linux-wireless@vger.kernel.org +S: Maintained +F: net/nfc/ +F: include/linux/nfc.h +F: include/net/nfc.h +F: drivers/nfc/ + NFS, SUNRPC, AND LOCKD CLIENTS M: Trond Myklebust L: linux-nfs@vger.kernel.org -- cgit v1.2.3 From fe8e084455f273b32cc57a5fbaf6c22ef984d657 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Tue, 23 Aug 2011 15:07:31 -0700 Subject: MAINTANERS: update Qualcomm Atheros addresses Qualcomm ate up Atheros, all of the old e-mail addresses no longer work and e-mails sent to it will bounce. Update the addresses to the new shiny Qualcomm Atheros (QCA) ones. Cc: stable@kernel.org Cc: netdev@vger.kernel.org Cc: jouni@qca.qualcomm.com Cc: yangjie@qca.qualcomm.com Cc: vthiagar@qca.qualcomm.com Cc: senthilb@qca.qualcomm.com Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville --- MAINTAINERS | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 4771368eb74..c66c093978d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1230,7 +1230,7 @@ F: Documentation/aoe/ F: drivers/block/aoe/ ATHEROS ATH GENERIC UTILITIES -M: "Luis R. Rodriguez" +M: "Luis R. Rodriguez" L: linux-wireless@vger.kernel.org S: Supported F: drivers/net/wireless/ath/* @@ -1238,7 +1238,7 @@ F: drivers/net/wireless/ath/* ATHEROS ATH5K WIRELESS DRIVER M: Jiri Slaby M: Nick Kossifidis -M: "Luis R. Rodriguez" +M: "Luis R. Rodriguez" M: Bob Copeland L: linux-wireless@vger.kernel.org L: ath5k-devel@lists.ath5k.org @@ -1247,10 +1247,10 @@ S: Maintained F: drivers/net/wireless/ath/ath5k/ ATHEROS ATH9K WIRELESS DRIVER -M: "Luis R. Rodriguez" -M: Jouni Malinen -M: Vasanthakumar Thiagarajan -M: Senthil Balasubramanian +M: "Luis R. Rodriguez" +M: Jouni Malinen +M: Vasanthakumar Thiagarajan +M: Senthil Balasubramanian L: linux-wireless@vger.kernel.org L: ath9k-devel@lists.ath9k.org W: http://wireless.kernel.org/en/users/Drivers/ath9k @@ -1278,7 +1278,7 @@ F: drivers/input/misc/ati_remote2.c ATLX ETHERNET DRIVERS M: Jay Cliburn M: Chris Snook -M: Jie Yang +M: Jie Yang L: netdev@vger.kernel.org W: http://sourceforge.net/projects/atl1 W: http://atl1.sourceforge.net -- cgit v1.2.3 From 33f810b2036f13f1b123062a9e5c1794d400ce81 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Sun, 31 Jul 2011 00:06:29 -0700 Subject: fddi: Move the FDDI drivers Move the FDDI drivers into drivers/net/fddi/ and make the necessary Kconfig and Makefile changes. CC: "Maciej W. Rozycki" CC: Christoph Goos CC: Signed-off-by: Jeff Kirsher --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index d32e1ca5ba7..2777088fa2b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2113,7 +2113,7 @@ F: net/decnet/ DEFXX FDDI NETWORK DRIVER M: "Maciej W. Rozycki" S: Maintained -F: drivers/net/defxx.* +F: drivers/net/fddi/defxx.* DELL LAPTOP DRIVER M: Matthew Garrett -- cgit v1.2.3 From 224cf5ad14c038b13c119dff29422f178a306f54 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Sun, 31 Jul 2011 02:38:19 -0700 Subject: ppp: Move the PPP drivers Move the PPP drivers into drivers/net/ppp/ and make the necessary Kconfig and Makefile changes. CC: Paul Mackerras CC: Frank Cusack CC: Michal Ostrowski CC: Michal Ostrowski CC: Dmitry Kozlov Signed-off-by: Jeff Kirsher --- MAINTAINERS | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 2777088fa2b..c5ec925fc9c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5066,7 +5066,7 @@ PPP PROTOCOL DRIVERS AND COMPRESSORS M: Paul Mackerras L: linux-ppp@vger.kernel.org S: Maintained -F: drivers/net/ppp_* +F: drivers/net/ppp/ppp_* PPP OVER ATM (RFC 2364) M: Mitchell Blank Jr @@ -5077,8 +5077,8 @@ F: include/linux/atmppp.h PPP OVER ETHERNET M: Michal Ostrowski S: Maintained -F: drivers/net/pppoe.c -F: drivers/net/pppox.c +F: drivers/net/ppp/pppoe.c +F: drivers/net/ppp/pppox.c PPP OVER L2TP M: James Chapman @@ -5099,7 +5099,7 @@ PPTP DRIVER M: Dmitry Kozlov L: netdev@vger.kernel.org S: Maintained -F: drivers/net/pptp.c +F: drivers/net/ppp/pptp.c W: http://sourceforge.net/projects/accel-pptp PREEMPTIBLE KERNEL -- cgit v1.2.3 From ff5a3b509e4ec96a2a4c57052a2d96e855778a24 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Mon, 1 Aug 2011 22:48:13 -0700 Subject: hippi: Move the HIPPI driver Move the HIPPI driver into drivers/net/hippi/ and make the necessary Kconfig and Makefile changes. CC: Jes Sorensen CC: Jes Sorensen Signed-off-by: Jeff Kirsher --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index c5ec925fc9c..194095ac07e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3049,6 +3049,7 @@ S: Maintained F: include/linux/hippidevice.h F: include/linux/if_hippi.h F: net/802/hippi.c +F: drivers/net/hippi/ HOST AP DRIVER M: Jouni Malinen -- cgit v1.2.3 From 12e62d6f7ec475e546b40bece2045da15d6c21ef Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Tue, 13 Sep 2011 10:21:25 +0300 Subject: MAINTAINERS: update ath6kl It's not in staging anymore and I'm the current maintainer. Cc: Luis R. Rodriguez Cc: Naveen Singh Signed-off-by: Kalle Valo Signed-off-by: John W. Linville --- MAINTAINERS | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index c66c093978d..ce0e60c7b07 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1246,6 +1246,14 @@ W: http://wireless.kernel.org/en/users/Drivers/ath5k S: Maintained F: drivers/net/wireless/ath/ath5k/ +ATHEROS ATH6KL WIRELESS DRIVER +M: Kalle Valo +L: linux-wireless@vger.kernel.org +W: http://wireless.kernel.org/en/users/Drivers/ath6kl +T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath6kl.git +S: Supported +F: drivers/net/wireless/ath/ath6kl/ + ATHEROS ATH9K WIRELESS DRIVER M: "Luis R. Rodriguez" M: Jouni Malinen @@ -6122,12 +6130,6 @@ M: Jakub Schmidtke S: Odd Fixes F: drivers/staging/asus_oled/ -STAGING - ATHEROS ATH6KL WIRELESS DRIVER -M: Luis R. Rodriguez -M: Naveen Singh -S: Odd Fixes -F: drivers/staging/ath6kl/ - STAGING - COMEDI M: Ian Abbott M: Mori Hess -- cgit v1.2.3 From 55eb94f9e923cba376cdf48ea5ab28d81116bead Mon Sep 17 00:00:00 2001 From: Ilan Elias Date: Sun, 18 Sep 2011 11:19:34 +0300 Subject: NFC: move nfc.h from include/net to include/net/nfc The file nfc.h was moved from include/net to include/net/nfc, since new NFC header files will be added to include/net/nfc. Signed-off-by: Ilan Elias Signed-off-by: John W. Linville --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index ce0e60c7b07..1789ce22ea8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4508,7 +4508,7 @@ L: linux-wireless@vger.kernel.org S: Maintained F: net/nfc/ F: include/linux/nfc.h -F: include/net/nfc.h +F: include/net/nfc/ F: drivers/nfc/ NFS, SUNRPC, AND LOCKD CLIENTS -- cgit v1.2.3 From b62ff718baab03ebfed6daa60882beffea9ab6c7 Mon Sep 17 00:00:00 2001 From: Wey-Yi Guy Date: Thu, 22 Sep 2011 15:14:49 -0700 Subject: MAINTAINERS: update iwlwifi Change to iwlwifi.git instead of iwlwifi-2.6.git iwlwifi-2.6.git still works for backward compatibility Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 1789ce22ea8..a31c6140a96 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3413,7 +3413,7 @@ M: Wey-Yi Guy M: Intel Linux Wireless L: linux-wireless@vger.kernel.org W: http://intellinuxwireless.org -T: git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi.git S: Supported F: drivers/net/wireless/iwlwifi/ -- cgit v1.2.3 From 1caa60b6d28a15be409002226145f0067a3070da Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Mon, 17 Oct 2011 09:31:59 +0000 Subject: MAINTAINERS: can: the mailinglist moved to vger.kernel.org Signed-off-by: Marc Kleine-Budde Acked-by: Oliver Hartkopp Signed-off-by: David S. Miller --- MAINTAINERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index aac56f9bf88..5008b087cb7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1671,7 +1671,7 @@ CAN NETWORK LAYER M: Oliver Hartkopp M: Oliver Hartkopp M: Urs Thuermann -L: socketcan-core@lists.berlios.de (subscribers-only) +L: linux-can@vger.kernel.org L: netdev@vger.kernel.org W: http://developer.berlios.de/projects/socketcan/ S: Maintained @@ -1683,7 +1683,7 @@ F: include/linux/can/raw.h CAN NETWORK DRIVERS M: Wolfgang Grandegger -L: socketcan-core@lists.berlios.de (subscribers-only) +L: linux-can@vger.kernel.org L: netdev@vger.kernel.org W: http://developer.berlios.de/projects/socketcan/ S: Maintained -- cgit v1.2.3