rhashtable: remove insecure_max_entries param

[mirror_ubuntu-artful-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 8e5da6fe4e0b4279fc7f8ab0bc08fe0f54b50894..28ea78b12d0cc1bd892e8f43e887ea81551acc13 100644 (file)
--- 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