diff --git a/MAINTAINERS b/MAINTAINERS
index 7ad424b7b8df3bc81295ff8097530d22dd3a6f6b..b2f710eee67a7cb340969c6cc91fab7f1940e5d7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3681,6 +3681,12 @@ S:	Maintained
 F:	Documentation/devicetree/bindings/media/coda.txt
 F:	drivers/media/platform/coda/
 
+CODE OF CONDUCT
+M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+S:	Supported
+F:	Documentation/process/code-of-conduct.rst
+F:	Documentation/process/code-of-conduct-interpretation.rst
+
 COMMON CLK FRAMEWORK
 M:	Michael Turquette <mturquette@baylibre.com>
 M:	Stephen Boyd <sboyd@kernel.org>