From 20edb50e593dca7522b4f3a95b801dbf99f24c52 Mon Sep 17 00:00:00 2001 From: "John W. Linville" Date: Fri, 30 May 2014 10:47:28 -0400 Subject: mac80211: remove PID rate control Minstrel has long since proven its worth. Signed-off-by: John W. Linville Signed-off-by: Johannes Berg --- MAINTAINERS | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 134483f206e4..54ba0e643c39 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5629,16 +5629,6 @@ F: Documentation/networking/mac80211-injection.txt F: include/net/mac80211.h F: net/mac80211/ -MAC80211 PID RATE CONTROL -M: Stefano Brivio -M: Mattias Nissler -L: linux-wireless@vger.kernel.org -W: http://wireless.kernel.org/en/developers/Documentation/mac80211/RateControl/PID -T: git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git -T: git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git -S: Maintained -F: net/mac80211/rc80211_pid* - MACVLAN DRIVER M: Patrick McHardy L: netdev@vger.kernel.org -- cgit v1.2.3-59-g8ed1b From f1d1baebd1f81904cd12d2bd578353853daa56b9 Mon Sep 17 00:00:00 2001 From: Jitendra Kalsaria Date: Mon, 23 Jun 2014 15:10:35 -0400 Subject: MAINTAINERS: Update bnx2 maintainers Signed-off-by: Jitendra Kalsaria 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 134483f206e4..884803978ed4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1894,7 +1894,8 @@ S: Supported F: drivers/net/ethernet/broadcom/genet/ BROADCOM BNX2 GIGABIT ETHERNET DRIVER -M: Michael Chan +M: Sony Chacko +M: Dept-HSGLinuxNICDev@qlogic.com L: netdev@vger.kernel.org S: Supported F: drivers/net/ethernet/broadcom/bnx2.* -- cgit v1.2.3-59-g8ed1b From 236294774e24b7a7ccbf2c7b699ca7cf2b897f94 Mon Sep 17 00:00:00 2001 From: Prashant Sreedharan Date: Fri, 27 Jun 2014 16:21:50 -0700 Subject: MAINTAINERS: Update tg3 maintainer Signed-off-by: Prashant Sreedharan Signed-off-by: Michael Chan 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 48f4ef44b252..f492681ea99e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1940,7 +1940,7 @@ F: arch/arm/boot/dts/bcm5301x.dtsi F: arch/arm/boot/dts/bcm470* BROADCOM TG3 GIGABIT ETHERNET DRIVER -M: Nithin Nayak Sujir +M: Prashant Sreedharan M: Michael Chan L: netdev@vger.kernel.org S: Supported -- cgit v1.2.3-59-g8ed1b From 68d96dcfc6c09b565d57897c127b61afbab74c6f Mon Sep 17 00:00:00 2001 From: Alexander Aring Date: Fri, 11 Jul 2014 10:24:19 +0200 Subject: MAINTAINERS: add net/6lowpan/ maintainer entry This patch add a maintainer entry for "net/6lowpan". Also add the current IEEE 802.15.4 mailing list and bluetooth mailinglist to this branch, because this code is shared between them. Signed-off-by: Alexander Aring Acked-by: Jukka Rissanen Signed-off-by: Marcel Holtmann --- MAINTAINERS | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 54ba0e643c39..0057ff580536 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -148,6 +148,13 @@ L: linux-scsi@vger.kernel.org S: Maintained F: drivers/scsi/53c700* +6LOWPAN GENERIC (BTLE/IEEE 802.15.4) +M: Alexander Aring +L: linux-zigbee-devel@lists.sourceforge.net (moderated for non-subscribers) +L: linux-bluetooth@vger.kernel.org +S: Maintained +F: net/6lowpan/ + 6PACK NETWORK DRIVER FOR AX.25 M: Andreas Koensgen L: linux-hams@vger.kernel.org -- cgit v1.2.3-59-g8ed1b From b5f4df3483a1679bc11eb2dd7dcf4f3c8b54d387 Mon Sep 17 00:00:00 2001 From: Alexei Starovoitov Date: Tue, 22 Jul 2014 23:01:59 -0700 Subject: bpf: update MAINTAINERS entry Signed-off-by: Alexei Starovoitov Signed-off-by: David S. Miller --- MAINTAINERS | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 78215a5dea28..62bf15f6954f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1912,6 +1912,13 @@ S: Supported F: drivers/net/bonding/ F: include/uapi/linux/if_bonding.h +BPF (Safe dynamic programs and tools) +M: Alexei Starovoitov +L: netdev@vger.kernel.org +L: linux-kernel@vger.kernel.org +S: Supported +F: kernel/bpf/ + BROADCOM B44 10/100 ETHERNET DRIVER M: Gary Zambrano L: netdev@vger.kernel.org -- cgit v1.2.3-59-g8ed1b From 6304f8fc398e4c8d2bac884ae2b4467c66620fd1 Mon Sep 17 00:00:00 2001 From: Alexander Aring Date: Mon, 28 Jul 2014 15:16:30 +0200 Subject: MAINTAINERS: add 6lowpan header file Since commit 68d96dcfc6c09b565d57897c127b61afbab74c6f ("MAINTAINERS: add net/6lowpan/ maintainer entry") we have a 6lowpan branch. This patch adds a forgotten file which should also be maintained by this branch. Signed-off-by: Alexander Aring Signed-off-by: Marcel Holtmann --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 0057ff580536..1859c2d0f9fc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -154,6 +154,7 @@ L: linux-zigbee-devel@lists.sourceforge.net (moderated for non-subscribers) L: linux-bluetooth@vger.kernel.org S: Maintained F: net/6lowpan/ +F: include/net/6lowpan.h 6PACK NETWORK DRIVER FOR AX.25 M: Andreas Koensgen -- cgit v1.2.3-59-g8ed1b From b9d317040a0a86104d0db0f02821a06fe4afc1cf Mon Sep 17 00:00:00 2001 From: Bing Zhao Date: Wed, 30 Jul 2014 13:57:16 -0700 Subject: MAINTAINERS: update for mwifiex driver maintainers Amitkumar and Avinash are taking care of mwifiex driver as the maintainers now due to organizational change. Signed-off-by: Bing Zhao Signed-off-by: Avinash Patil Signed-off-by: Amitkumar Karwar 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 1859c2d0f9fc..1b9bef7a06c9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5681,7 +5681,8 @@ S: Maintained F: drivers/net/ethernet/marvell/mvneta.* MARVELL MWIFIEX WIRELESS DRIVER -M: Bing Zhao +M: Amitkumar Karwar +M: Avinash Patil L: linux-wireless@vger.kernel.org S: Maintained F: drivers/net/wireless/mwifiex/ -- cgit v1.2.3-59-g8ed1b