summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-10-19 11:30:16 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-10-22 07:33:36 +0100
commit8e630c31a3dfc7f4ab1007f95dd507cb2fe1dda5 (patch)
treecdb32211f27b55b887e46e00f8b9e231e1bbe738
parentf3f76d640141e9a5aababafb80abbdc1c3c46823 (diff)
downloadlinux-8e630c31a3dfc7f4ab1007f95dd507cb2fe1dda5.tar.bz2
MAINTAINERS: Add an entry for the code of conduct
As I introduced these files, I'm willing to be the maintainer of them as well. Acked-by: Chris Mason <clm@fb.com> Acked-by: Olof Johansson <olof@lixom.net> Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org> Acked-by: Theodore Ts'o <tytso@mit.edu> Acked-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--MAINTAINERS6
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 7ad424b7b8df..b2f710eee67a 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>