Merge tag 'media/v3.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[firefly-linux-kernel-4.4.55.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 4507a7e87c009892ebe7635f21022d9a889be210..7675425cabb86637a8b87790f5540534df38c593 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5495,15 +5495,6 @@ S:       Supported
 F:     arch/powerpc/include/asm/kvm*
 F:     arch/powerpc/kvm/
 
-KERNEL VIRTUAL MACHINE For Itanium (KVM/IA64)
-M:     Xiantao Zhang <xiantao.zhang@intel.com>
-L:     kvm-ia64@vger.kernel.org
-W:     http://kvm.qumranet.com
-S:     Supported
-F:     Documentation/ia64/kvm.txt
-F:     arch/ia64/include/asm/kvm*
-F:     arch/ia64/kvm/
-
 KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
 M:     Christian Borntraeger <borntraeger@de.ibm.com>
 M:     Cornelia Huck <cornelia.huck@de.ibm.com>
@@ -6619,19 +6610,8 @@ L:       netdev@vger.kernel.org
 S:     Maintained
 
 NETWORKING [WIRELESS]
-M:     "John W. Linville" <linville@tuxdriver.com>
 L:     linux-wireless@vger.kernel.org
 Q:     http://patchwork.kernel.org/project/linux-wireless/list/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git
-S:     Maintained
-F:     net/mac80211/
-F:     net/rfkill/
-F:     net/wireless/
-F:     include/net/ieee80211*
-F:     include/linux/wireless.h
-F:     include/uapi/linux/wireless.h
-F:     include/net/iw_handler.h
-F:     drivers/net/wireless/
 
 NETWORKING DRIVERS
 L:     netdev@vger.kernel.org
@@ -6652,6 +6632,14 @@ F:       include/linux/inetdevice.h
 F:     include/uapi/linux/if_*
 F:     include/uapi/linux/netdevice.h
 
+NETWORKING DRIVERS (WIRELESS)
+M:     Kalle Valo <kvalo@codeaurora.org>
+L:     linux-wireless@vger.kernel.org
+Q:     http://patchwork.kernel.org/project/linux-wireless/list/
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git/
+S:     Maintained
+F:     drivers/net/wireless/
+
 NETXEN (1/10) GbE SUPPORT
 M:     Manish Chopra <manish.chopra@qlogic.com>
 M:     Sony Chacko <sony.chacko@qlogic.com>
@@ -10249,13 +10237,13 @@ L:    netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/ethernet/via/via-velocity.*
 
-VIVI VIRTUAL VIDEO DRIVER
+VIVID VIRTUAL VIDEO DRIVER
 M:     Hans Verkuil <hverkuil@xs4all.nl>
 L:     linux-media@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
 W:     http://linuxtv.org
 S:     Maintained
-F:     drivers/media/platform/vivi*
+F:     drivers/media/platform/vivid/*
 
 VLAN (802.1Q)
 M:     Patrick McHardy <kaber@trash.net>