Merge branch 'locking/atomics' into locking/core, to pick up WIP commits

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 2d3c1918f1b024ff94876d4ba34882d079f9d10b..8b95aa5363dd3e0b4cc1ccdb8ca83c650479d00c 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2609,6 +2609,7 @@ L:        linux-kernel@vger.kernel.org
 S:     Maintained
 F:     arch/*/include/asm/atomic*.h
 F:     include/*/atomic*.h
+F:     scripts/atomic/
 
 ATTO EXPRESSSAS SAS/SATA RAID SCSI DRIVER
 M:     Bradley Grove <linuxdrivers@attotech.com>
@@ -16641,6 +16642,15 @@ S:     Maintained
 F:     drivers/platform/x86/
 F:     drivers/platform/olpc/
 
+X86 PLATFORM DRIVERS - ARCH
+R:     Darren Hart <dvhart@infradead.org>
+R:     Andy Shevchenko <andy@infradead.org>
+L:     platform-driver-x86@vger.kernel.org
+L:     x86@kernel.org
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/core
+S:     Maintained
+F:     arch/x86/platform
+
 X86 VDSO
 M:     Andy Lutomirski <luto@kernel.org>
 L:     linux-kernel@vger.kernel.org