From 8a3b7a252dca9fb28c23b5bf76c49180a2b60d3b Mon Sep 17 00:00:00 2001 From: danborkmann@iogearbox.net Date: Thu, 19 Jan 2012 00:39:31 +0000 Subject: drivers/net/ethernet/xilinx: added Xilinx AXI Ethernet driver This driver adds support for Xilinx 10/100/1000 AXI Ethernet. It can be used, for instance, on Xilinx boards with a Microblaze architecture like the ML605. The patch is against the latest net-next tree and checkpatch clean. Signed-off-by: Ariane Keller Signed-off-by: Daniel Borkmann Signed-off-by: David S. Miller --- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 93c68d5f1cf4..087b65d12580 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7469,6 +7469,12 @@ S: Supported F: Documentation/filesystems/xfs.txt F: fs/xfs/ +XILINX AXI ETHERNET DRIVER +M: Ariane Keller +M: Daniel Borkmann +S: Maintained +F: drivers/net/ethernet/xilinx/xilinx_axienet* + XILINX SYSTEMACE DRIVER M: Grant Likely W: http://www.secretlab.ca/ -- cgit v1.2.3 From ed072f9e80f02e5ae4150ad5a605fc3906e9fbc7 Mon Sep 17 00:00:00 2001 From: Rafał Miłecki Date: Sun, 29 Jan 2012 11:59:42 +0100 Subject: MAINTAINERS: update b43(legacy) mailing list Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville --- MAINTAINERS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 6e68daa1e64b..1adb206dfcac 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1411,7 +1411,7 @@ F: net/ax25/ B43 WIRELESS DRIVER M: Stefano Brivio L: linux-wireless@vger.kernel.org -L: b43-dev@lists.infradead.org (moderated for non-subscribers) +L: b43-dev@lists.infradead.org W: http://linuxwireless.org/en/users/Drivers/b43 S: Maintained F: drivers/net/wireless/b43/ @@ -1420,6 +1420,7 @@ B43LEGACY WIRELESS DRIVER M: Larry Finger M: Stefano Brivio L: linux-wireless@vger.kernel.org +L: b43-dev@lists.infradead.org W: http://linuxwireless.org/en/users/Drivers/b43 S: Maintained F: drivers/net/wireless/b43legacy/ -- cgit v1.2.3 From 5c6652f556842f838b6963023dcc25db748ececc Mon Sep 17 00:00:00 2001 From: Neel Patel Date: Fri, 3 Feb 2012 08:25:25 +0000 Subject: enic: Update enic maintainers Signed-off-by: Neel Patel Signed-off-by: Christian Benvenuti Signed-off-by: Roopa Prabhu Signed-off-by: Nishank Trivedi 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 087b65d12580..6929dceb2363 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1804,7 +1804,8 @@ F: Documentation/zh_CN/ CISCO VIC ETHERNET NIC DRIVER M: Christian Benvenuti M: Roopa Prabhu -M: David Wang +M: Neel Patel +M: Nishank Trivedi S: Supported F: drivers/net/ethernet/cisco/enic/ -- cgit v1.2.3 From 234f6e5c05277c0198797553434e2ed5acac18cc Mon Sep 17 00:00:00 2001 From: David Gibson Date: Mon, 6 Feb 2012 14:07:24 +1100 Subject: orinoco: Remove old mailing lists from MAINTAINERS The two orinoco mailing lists on sourceforge were set up many years ago and are now more or less moribund. I'd like to shut them down, so I don't have to keep filtering the spam from them (which is most of what comes through now). In preparation, this patch removes the reference to them from the MAINTAINERS file. Any remaining discussion of this approaching obsolete driver can go to the linux-wireless list. Signed-off-by: David Gibson Acked-by: Pavel Roskin Signed-off-by: John W. Linville --- MAINTAINERS | 2 -- 1 file changed, 2 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 1adb206dfcac..bcb668c0af71 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4894,8 +4894,6 @@ F: fs/ocfs2/ ORINOCO DRIVER L: linux-wireless@vger.kernel.org -L: orinoco-users@lists.sourceforge.net -L: orinoco-devel@lists.sourceforge.net W: http://linuxwireless.org/en/users/Drivers/orinoco W: http://www.nongnu.org/orinoco/ S: Orphan -- cgit v1.2.3 From 14433f4df21b2ab8287084d8348bede6bf813a90 Mon Sep 17 00:00:00 2001 From: Arend van Spriel Date: Thu, 9 Feb 2012 21:08:55 +0100 Subject: brcm80211: update the maintainers listed for brcm80211 drivers Henry Ptasinski is not working on the brcm80211 driver so taking his name/email out of the MAINTAINERS file. Reviewed-by: Pieter-Paul Giesberts Reviewed-by: Franky (Zhenhui) Lin Signed-off-by: Arend van Spriel Signed-off-by: John W. Linville --- MAINTAINERS | 1 - 1 file changed, 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 48418c8475f0..0b92435d9f51 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1575,7 +1575,6 @@ F: drivers/net/ethernet/broadcom/tg3.* BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER M: Brett Rudley -M: Henry Ptasinski M: Roland Vossen M: Arend van Spriel M: Franky (Zhenhui) Lin -- cgit v1.2.3 From 7fbc415d7bd0ff0224eea53c678fa9f13f646b4f Mon Sep 17 00:00:00 2001 From: Richard Cochran Date: Sat, 10 Mar 2012 01:55:53 +0000 Subject: MAINTAINERS: add an entry for the PHC code Some months ago, tglx asked me off list if I would maintain the PTP Hardware Clock code. Since then, the code has been fully merged, and I am actively looking after it. This patch makes it official. Signed-off-by: Richard Cochran Acked-by: John Stultz Signed-off-by: David S. Miller --- MAINTAINERS | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 0d01192651ef..209a386214c2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5317,6 +5317,17 @@ L: cbe-oss-dev@lists.ozlabs.org S: Maintained F: drivers/block/ps3vram.c +PTP HARDWARE CLOCK SUPPORT +M: Richard Cochran +S: Maintained +W: http://linuxptp.sourceforge.net/ +F: Documentation/ABI/testing/sysfs-ptp +F: Documentation/ptp/* +F: drivers/net/gianfar_ptp.c +F: drivers/net/phy/dp83640* +F: drivers/ptp/* +F: include/linux/ptp_cl* + PTRACE SUPPORT M: Roland McGrath M: Oleg Nesterov -- cgit v1.2.3