From c8ac8aa8d43561fefac7646339b2613767c9fa10 Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Mon, 22 Jul 2013 12:32:20 +0300 Subject: MAINTAINERS: add ath10k I forgot to add an entry to MAINTAINERS when submitting the driver. Signed-off-by: Kalle Valo Signed-off-by: John W. Linville --- MAINTAINERS | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index bf61e04291a..44626b82d63 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6719,6 +6719,14 @@ T: git git://linuxtv.org/anttip/media_tree.git S: Maintained F: drivers/media/tuners/qt1010* +QUALCOMM ATHEROS ATH10K WIRELESS DRIVER +M: Kalle Valo +L: ath10k@lists.infradead.org +W: http://wireless.kernel.org/en/users/Drivers/ath10k +T: git git://github.com/kvalo/ath.git +S: Supported +F: drivers/net/wireless/ath/ath10k/ + QUALCOMM HEXAGON ARCHITECTURE M: Richard Kuo L: linux-hexagon@vger.kernel.org -- cgit v1.2.3-70-g09d2 From 7309e5022bdd6fe13124d42a6b7cf054311030a0 Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Mon, 22 Jul 2013 12:32:27 +0300 Subject: MAINTAINERS: update ath6kl git location The git tree is in github.com nowadays. Signed-off-by: Kalle Valo 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 44626b82d63..7a403ba167d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1406,7 +1406,7 @@ 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 +T: git git://github.com/kvalo/ath.git S: Supported F: drivers/net/wireless/ath/ath6kl/ -- cgit v1.2.3-70-g09d2 From 4d58c0252002646ea522f5c6c623e558af459b39 Mon Sep 17 00:00:00 2001 From: Daniel Borkmann Date: Tue, 23 Jul 2013 14:51:48 +0200 Subject: net: sctp: trivial: add uapi/linux/sctp.h into maintainers After this file has moved to the uapi section, we also need to update this in the maintainers file. Signed-off-by: Daniel Borkmann Acked-by: Neil Horman Acked-by: Vlad Yasevich Signed-off-by: David S. Miller --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index bf61e04291a..339e7989fb5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7216,6 +7216,7 @@ W: http://lksctp.sourceforge.net S: Maintained F: Documentation/networking/sctp.txt F: include/linux/sctp.h +F: include/uapi/linux/sctp.h F: include/net/sctp/ F: net/sctp/ -- cgit v1.2.3-70-g09d2 From 6161b02b934bcf013f3bd7468222e24d4d597fbf Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Tue, 23 Jul 2013 14:03:39 +0200 Subject: iwlwifi: list Emmanuel in maintainers file Wey-Yi has moved on a while ago, but we forgot to update the maintainers file. Since Emmanuel is de facto maintaining the driver along with myself now, list him instead. Reviewed-by: Emmanuel Grumbach Signed-off-by: Johannes Berg --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index bf61e04291a..d44a5e8745d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4362,7 +4362,7 @@ F: drivers/net/wireless/iwlegacy/ INTEL WIRELESS WIFI LINK (iwlwifi) M: Johannes Berg -M: Wey-Yi Guy +M: Emmanuel Grumbach M: Intel Linux Wireless L: linux-wireless@vger.kernel.org W: http://intellinuxwireless.org -- cgit v1.2.3-70-g09d2 From 0293ba201ddd9256552704efef5c2bbf18a78574 Mon Sep 17 00:00:00 2001 From: Samuel Ortiz Date: Mon, 24 Jun 2013 14:39:35 +0200 Subject: MAINTAINERS: Change the NFC subsystem status to Supported Signed-off-by: Samuel Ortiz --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 1ea2d043bf5..2116b9a9374 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5791,7 +5791,7 @@ M: Aloisio Almeida Jr M: Samuel Ortiz L: linux-wireless@vger.kernel.org L: linux-nfc@lists.01.org (moderated for non-subscribers) -S: Maintained +S: Supported F: net/nfc/ F: include/net/nfc/ F: include/uapi/linux/nfc.h -- cgit v1.2.3-70-g09d2 From 2bc9ff01f1f93da6c36b34dbc7ce7c42f717693e Mon Sep 17 00:00:00 2001 From: Denis Kirjanov Date: Sat, 17 Aug 2013 09:08:49 +0400 Subject: sundance: Add myself as a maintainer Signed-off-by: Denis Kirjanov Signed-off-by: David S. Miller --- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 1c6f9db0de7..a83dd4f10bb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7973,6 +7973,12 @@ F: arch/m68k/sun3*/ F: arch/m68k/include/asm/sun3* F: drivers/net/ethernet/i825xx/sun3* +SUNDANCE NETWORK DRIVER +M: Denis Kirjanov +L: netdev@vger.kernel.org +S: Maintained +F: drivers/net/ethernet/dlink/sundance.c + SUPERH M: Paul Mundt L: linux-sh@vger.kernel.org -- cgit v1.2.3-70-g09d2 From 001e1c1d5ec6282726e3d051eeaf776504ee8e45 Mon Sep 17 00:00:00 2001 From: "govindarajulu.v" Date: Wed, 4 Sep 2013 11:17:18 +0530 Subject: driver/net: enic: update enic maintainers and driver Signed-off-by: Govindarajulu Varadarajan Signed-off-by: Sujith Sankar Signed-off-by: Nishank Trivedi Signed-off-by: Christian Benvenuti Signed-off-by: David S. Miller --- MAINTAINERS | 3 ++- drivers/net/ethernet/cisco/enic/enic.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 705bb96bc37..ecb83cdf06c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2076,7 +2076,8 @@ F: drivers/usb/chipidea/ CISCO VIC ETHERNET NIC DRIVER M: Christian Benvenuti -M: Roopa Prabhu +M: Sujith Sankar +M: Govindarajulu Varadarajan M: Neel Patel M: Nishank Trivedi S: Supported diff --git a/drivers/net/ethernet/cisco/enic/enic.h b/drivers/net/ethernet/cisco/enic/enic.h index 34b637a797b..e9f7c656ddd 100644 --- a/drivers/net/ethernet/cisco/enic/enic.h +++ b/drivers/net/ethernet/cisco/enic/enic.h @@ -32,7 +32,7 @@ #define DRV_NAME "enic" #define DRV_DESCRIPTION "Cisco VIC Ethernet NIC Driver" -#define DRV_VERSION "2.1.1.43" +#define DRV_VERSION "2.1.1.50" #define DRV_COPYRIGHT "Copyright 2008-2013 Cisco Systems, Inc" #define ENIC_BARS_MAX 6 -- cgit v1.2.3-70-g09d2