X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=MAINTAINERS;h=28ea78b12d0cc1bd892e8f43e887ea81551acc13;hb=038a3e858de4e3ddf42c330a22b7efcddbc0a81a;hp=8e5da6fe4e0b4279fc7f8ab0bc08fe0f54b50894;hpb=fb796707d7a6c9b24fdf80b9b4f24fa5ffcf0ec5;p=mirror_ubuntu-artful-kernel.git

diff --git a/MAINTAINERS b/MAINTAINERS
index 8e5da6fe4e0b..28ea78b12d0c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7887,7 +7887,7 @@ S:	Maintained
 F:	drivers/net/ethernet/marvell/mvneta.*
 
 MARVELL MWIFIEX WIRELESS DRIVER
-M:	Amitkumar Karwar <akarwar@marvell.com>
+M:	Amitkumar Karwar <amitkarwar@gmail.com>
 M:	Nishant Sarmukadam <nishants@marvell.com>
 M:	Ganapathi Bhat <gbhat@marvell.com>
 M:	Xinming Hu <huxm@marvell.com>
@@ -13317,8 +13317,11 @@ L:	netdev@vger.kernel.org
 S:	Maintained
 F:	include/linux/virtio_vsock.h
 F:	include/uapi/linux/virtio_vsock.h
+F:	include/uapi/linux/vsockmon.h
+F:	net/vmw_vsock/af_vsock_tap.c
 F:	net/vmw_vsock/virtio_transport_common.c
 F:	net/vmw_vsock/virtio_transport.c
+F:	drivers/net/vsockmon.c
 F:	drivers/vhost/vsock.c
 F:	drivers/vhost/vsock.h