Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 08995da6e16ac226beab7fca9106c4413d7ce337..4f004dc0a0f21ef2a9babf48e1f3e0d108df1b48 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>
@@ -3753,7 +3755,7 @@ CHROME HARDWARE PLATFORM SUPPORT
 M:     Benson Leung <bleung@chromium.org>
 M:     Enric Balletbo i Serra <enric.balletbo@collabora.com>
 S:     Maintained
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git
 F:     drivers/platform/chrome/
 
 CHROMEOS EC SUBDRIVERS
@@ -9900,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>