Merge tag 'trace-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux...

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index b5bffd2d7f8c66968c996e3ade3fa8930aa3cb56..e2ec45968a1643d1a8e977caa21879fdd8d4c46a 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1059,6 +1059,8 @@ L:        netdev@vger.kernel.org
 S:     Odd fixes
 F:     drivers/net/appletalk/
 F:     net/appletalk/
+F:     include/linux/atalk.h
+F:     include/uapi/linux/atalk.h
 
 APPLIED MICRO (APM) X-GENE DEVICE TREE SUPPORT
 M:     Khuong Dinh <khuong@os.amperecomputing.com>
@@ -7170,6 +7172,7 @@ F:        drivers/net/hyperv/
 F:     drivers/scsi/storvsc_drv.c
 F:     drivers/uio/uio_hv_generic.c
 F:     drivers/video/fbdev/hyperv_fb.c
+F:     drivers/iommu/hyperv_iommu.c
 F:     net/vmw_vsock/hyperv_transport.c
 F:     include/linux/hyperv.h
 F:     include/uapi/linux/hyperv.h
@@ -9899,6 +9902,7 @@ M:        Vadim Pasternak <vadimp@mellanox.com>
 L:     platform-driver-x86@vger.kernel.org
 S:     Supported
 F:     drivers/platform/mellanox/
+F:     include/linux/platform_data/mlxreg.h
 
 MELLANOX MLX4 core VPI driver
 M:     Tariq Toukan <tariqt@mellanox.com>