Merge tag 'v5.2' into perf/core, to pick up fixes

[linux-2.6-block.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 677ef41cb012ca2a3f4fb9ee56bdc45c450ff6cc..c80bd74681ccb6a47ed6d8ecaf9145713257e892 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -17496,6 +17496,12 @@ Q:     https://patchwork.linuxtv.org/project/linux-media/list/
 S:     Maintained
 F:     drivers/media/dvb-frontends/zd1301_demod*
 
+ZHAOXIN PROCESSOR SUPPORT
+M:     Tony W Wang-oc <TonyWWang-oc@zhaoxin.com>
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+F:     arch/x86/kernel/cpu/zhaoxin.c
+
 ZPOOL COMPRESSED PAGE STORAGE API
 M:     Dan Streetman <ddstreet@ieee.org>
 L:     linux-mm@kvack.org