Merge tag 'x86_cache_for_v6.9_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 7e1cc1f4c290039f3cf6027ea56c6a505a05b050..747f492ce6ccd8b2223219b2a8fbe58e055cdd92 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11157,6 +11157,16 @@ L:     netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/wwan/iosm/
 
+INTEL(R) FLEXIBLE RETURN AND EVENT DELIVERY
+M:     Xin Li <xin@zytor.com>
+M:     "H. Peter Anvin" <hpa@zytor.com>
+S:     Supported
+F:     Documentation/arch/x86/x86_64/fred.rst
+F:     arch/x86/entry/entry_64_fred.S
+F:     arch/x86/entry/entry_fred.c
+F:     arch/x86/include/asm/fred.h
+F:     arch/x86/kernel/fred.c
+
 INTEL(R) TRACE HUB
 M:     Alexander Shishkin <alexander.shishkin@linux.intel.com>
 S:     Supported
@@ -17503,6 +17513,7 @@ T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
 F:     fs/timerfd.c
 F:     include/linux/time_namespace.h
 F:     include/linux/timer*
+F:     include/trace/events/timer*
 F:     kernel/time/*timer*
 F:     kernel/time/namespace.c