Merge remote-tracking branch 'tip/auto-latest'

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 5ec6b79f931849d9d054f8d6e775c987962d640c..af0718f02616d3ad4af7a12df97b0dc5d22898dd 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -654,11 +654,6 @@ F: drivers/gpu/drm/radeon/radeon_kfd.c
 F:     drivers/gpu/drm/radeon/radeon_kfd.h
 F:     include/uapi/linux/kfd_ioctl.h
 
-AMD MICROCODE UPDATE SUPPORT
-M:     Borislav Petkov <bp@alien8.de>
-S:     Maintained
-F:     arch/x86/kernel/cpu/microcode/amd*
-
 AMD XGBE DRIVER
 M:     Tom Lendacky <thomas.lendacky@amd.com>
 L:     netdev@vger.kernel.org
@@ -5496,12 +5491,6 @@ W:       https://01.org/linux-acpi
 S:     Supported
 F:     drivers/platform/x86/intel_menlow.c
 
-INTEL IA32 MICROCODE UPDATE SUPPORT
-M:     Borislav Petkov <bp@alien8.de>
-S:     Maintained
-F:     arch/x86/kernel/cpu/microcode/core*
-F:     arch/x86/kernel/cpu/microcode/intel*
-
 INTEL I/OAT DMA DRIVER
 M:     Dave Jiang <dave.jiang@intel.com>
 R:     Dan Williams <dan.j.williams@intel.com>
@@ -11615,6 +11604,11 @@ L:     linux-edac@vger.kernel.org
 S:     Maintained
 F:     arch/x86/kernel/cpu/mcheck/*
 
+X86 MICROCODE UPDATE SUPPORT
+M:     Borislav Petkov <bp@alien8.de>
+S:     Maintained
+F:     arch/x86/kernel/cpu/microcode/*
+
 X86 VDSO
 M:     Andy Lutomirski <luto@amacapital.net>
 L:     linux-kernel@vger.kernel.org