summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2019-02-02 10:45:17 +0100
committerBorislav Petkov <bp@suse.de>2019-02-02 10:45:17 +0100
commit84ba10d633f1e8886e62bfd88e1b04ea28310483 (patch)
treecdea4b31d0e59393cccdfb31aa283d00d1836012 /MAINTAINERS
parent912ebd99edfa1d1695083fa6d34ac878346ac66b (diff)
parente6d429313ea5c776d2e76b4494df69102e6b7115 (diff)
downloadlinux-84ba10d633f1e8886e62bfd88e1b04ea28310483.tar.gz
linux-84ba10d633f1e8886e62bfd88e1b04ea28310483.tar.bz2
linux-84ba10d633f1e8886e62bfd88e1b04ea28310483.zip
Merge remote-tracking branch 'tip/x86/urgent' into edac-for-5.1
... to pick up dependent change: 00ae831dfe44 ("x86/cpu: Add Atom Tremont (Jacobsville)") introducing the model number define which will be needed by the new i10nm_edac driver for 10nm Intel Atoms. Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS9
1 files changed, 9 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 0f5ef1d6299a..518b9e5232d0 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -16638,6 +16638,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