media: exynos4-is: fix wrong mdev and v4l2 dev order in error path

[platform/kernel/linux-exynos.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 164cf01..fae0217 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7440,6 +7440,19 @@ S:       Maintained
 F:     Documentation/kbuild/kconfig-language.txt
 F:     scripts/kconfig/
 
+KDBUS
+M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+M:     Daniel Mack <daniel@zonque.org>
+M:     David Herrmann <dh.herrmann@googlemail.com>
+M:     Djalal Harouni <tixxdz@opendz.org>
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+F:     ipc/kdbus/*
+F:     samples/kdbus/*
+F:     Documentation/kdbus/*
+F:     include/uapi/linux/kdbus.h
+F:     tools/testing/selftests/kdbus/
+
 KDUMP
 M:     Dave Young <dyoung@redhat.com>
 M:     Baoquan He <bhe@redhat.com>
@@ -7670,16 +7683,6 @@ F:       include/linux/kdb.h
 F:     include/linux/kgdb.h
 F:     kernel/debug/
 
-KMEMCHECK
-M:     Vegard Nossum <vegardno@ifi.uio.no>
-M:     Pekka Enberg <penberg@kernel.org>
-S:     Maintained
-F:     Documentation/dev-tools/kmemcheck.rst
-F:     arch/x86/include/asm/kmemcheck.h
-F:     arch/x86/mm/kmemcheck/
-F:     include/linux/kmemcheck.h
-F:     mm/kmemcheck.c
-
 KMEMLEAK
 M:     Catalin Marinas <catalin.marinas@arm.com>
 S:     Maintained
@@ -9011,6 +9014,7 @@ MIPS GENERIC PLATFORM
 M:     Paul Burton <paul.burton@mips.com>
 L:     linux-mips@linux-mips.org
 S:     Supported
+F:     Documentation/devicetree/bindings/power/mti,mips-cpc.txt
 F:     arch/mips/generic/
 F:     arch/mips/tools/generic-board-config.sh
 
@@ -12671,6 +12675,7 @@ F:      arch/alpha/kernel/srm_env.c
 
 STABLE BRANCH
 M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+M:     Sasha Levin <sashal@kernel.org>
 L:     stable@vger.kernel.org
 S:     Supported
 F:     Documentation/process/stable-kernel-rules.rst
@@ -13611,23 +13616,14 @@ F:    drivers/platform/x86/toshiba-wmi.c
 
 TPM DEVICE DRIVER
 M:     Peter Huewe <peterhuewe@gmx.de>
-M:     Marcel Selhorst <tpmdd@selhorst.net>
 M:     Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
 R:     Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
-W:     http://tpmdd.sourceforge.net
-L:     tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
-Q:     https://patchwork.kernel.org/project/tpmdd-devel/list/
+L:     linux-integrity@vger.kernel.org
+Q:     https://patchwork.kernel.org/project/linux-integrity/list/
 T:     git git://git.infradead.org/users/jjs/linux-tpmdd.git
 S:     Maintained
 F:     drivers/char/tpm/
 
-TPM IBM_VTPM DEVICE DRIVER
-M:     Ashley Lai <ashleydlai@gmail.com>
-W:     http://tpmdd.sourceforge.net
-L:     tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
-S:     Maintained
-F:     drivers/char/tpm/tpm_ibmvtpm*
-
 TRACING
 M:     Steven Rostedt <rostedt@goodmis.org>
 M:     Ingo Molnar <mingo@redhat.com>