Revert "HACK: ARM: dts: dra7-ipu-common: Revert to CMA pools for IPU early boots"

[rpmsg/rpmsg.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 556f902b3766e29f3473b812e267bda224fb1d6d..b2f710eee67a7cb340969c6cc91fab7f1940e5d7 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3006,6 +3006,14 @@ S:       Supported
 F:     drivers/gpio/gpio-brcmstb.c
 F:     Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.txt
 
+BROADCOM BRCMSTB I2C DRIVER
+M:     Kamal Dasu <kdasu.kdev@gmail.com>
+L:     linux-i2c@vger.kernel.org
+L:     bcm-kernel-feedback-list@broadcom.com
+S:     Supported
+F:     drivers/i2c/busses/i2c-brcmstb.c
+F:     Documentation/devicetree/bindings/i2c/i2c-brcmstb.txt
+
 BROADCOM BRCMSTB USB2 and USB3 PHY DRIVER
 M:     Al Cooper <alcooperx@gmail.com>
 L:     linux-kernel@vger.kernel.org
@@ -3673,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>
@@ -10122,7 +10136,6 @@ L:      netdev@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git
 S:     Maintained
-F:     net/core/flow.c
 F:     net/xfrm/
 F:     net/key/
 F:     net/ipv4/xfrm*