From a9533e7ea3c410fed2f4cd8b3e1e213e48529b75 Mon Sep 17 00:00:00 2001 From: Henry Ptasinski Date: Wed, 8 Sep 2010 21:04:42 -0700 Subject: Staging: Add initial release of brcm80211 - Broadcom 802.11n wireless LAN driver. Signed-off-by: Henry Ptasinski Cc: Brett Rudley Cc: Nohee Ko Signed-off-by: Greg Kroah-Hartman --- MAINTAINERS | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index c36f5d76e1a..a3f9786cc6f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1392,6 +1392,14 @@ L: netdev@vger.kernel.org S: Supported F: drivers/net/tg3.* +BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER +M: Brett Rudley +M: Henry Ptasinski +M: Nohee Ko +L: linux-wireless@vger.kernel.org +S: Supported +F: drivers/staging/brcm80211/ + BROCADE BFA FC SCSI DRIVER M: Jing Huang L: linux-scsi@vger.kernel.org -- cgit v1.2.3-18-g5258 From db7bee24d23d82cc55c7cbc9a1f82d07066d6fce Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Mon, 4 Oct 2010 22:28:10 +0200 Subject: autofs3: move to drivers/staging Nobody appears to be interested in fixing autofs3 bugs any more and it uses the BKL, which is going away. Move this to staging for retirement. Unless someone complains until 2.6.38, we can remove it for good. The include/linux/auto_fs.h header file is still used by autofs4, so it remains in place. Signed-off-by: Arnd Bergmann Cc: Ian Kent Cc: autofs@linux.kernel.org Cc: "H. Peter Anvin" Acked-by: H. Peter Anvin Signed-off-by: Greg Kroah-Hartman --- MAINTAINERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index a3f9786cc6f..0d675a94d63 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3314,8 +3314,8 @@ F: Documentation/kdump/ KERNEL AUTOMOUNTER (AUTOFS) M: "H. Peter Anvin" L: autofs@linux.kernel.org -S: Odd Fixes -F: fs/autofs/ +S: Obsolete +F: drivers/staging/autofs/ KERNEL AUTOMOUNTER v4 (AUTOFS4) M: Ian Kent -- cgit v1.2.3-18-g5258 From 671a6e3cc9d8b49e552590500b8281fd33ce1466 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 6 Oct 2010 08:18:01 -0700 Subject: Staging: the tree is now kept in git, not quilt Update the MAINTAINERS file to show the new location of the staging development tree. Signed-off-by: Greg Kroah-Hartman --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 0d675a94d63..ee8b2b4c6b3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5537,7 +5537,7 @@ S: Maintained STAGING SUBSYSTEM M: Greg Kroah-Hartman -T: quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/ +T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-next-2.6.git L: devel@driverdev.osuosl.org S: Maintained F: drivers/staging/ -- cgit v1.2.3-18-g5258