Merge branch 'i2c/for-mergewindow' of git://git.kernel.org/pub/scm/linux/kernel/git...

[uclinux-h8/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 2f30567..1d7d89f 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2510,7 +2510,7 @@ S:        Maintained
 F:     Documentation/devicetree/bindings/arm/rda.yaml
 F:     Documentation/devicetree/bindings/gpio/gpio-rda.yaml
 F:     Documentation/devicetree/bindings/interrupt-controller/rda,8810pl-intc.txt
-F:     Documentation/devicetree/bindings/serial/rda,8810pl-uart.txt
+F:     Documentation/devicetree/bindings/serial/rda,8810pl-uart.yaml
 F:     Documentation/devicetree/bindings/timer/rda,8810pl-timer.txt
 F:     arch/arm/boot/dts/rda8810pl-*
 F:     drivers/clocksource/timer-rda.c
@@ -6444,6 +6444,7 @@ L:        dri-devel@lists.freedesktop.org
 S:     Supported
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git
 F:     Documentation/devicetree/bindings/display/exynos/
+F:     Documentation/devicetree/bindings/display/samsung/
 F:     drivers/gpu/drm/exynos/
 F:     include/uapi/drm/exynos_drm.h
 
@@ -10171,6 +10172,7 @@ M:      Corey Minyard <minyard@acm.org>
 L:     openipmi-developer@lists.sourceforge.net (moderated for non-subscribers)
 S:     Supported
 W:     http://openipmi.sourceforge.net/
+T:     git https://github.com/cminyard/linux-ipmi.git for-next
 F:     Documentation/driver-api/ipmi.rst
 F:     Documentation/devicetree/bindings/ipmi/
 F:     drivers/char/ipmi/
@@ -14555,6 +14557,7 @@ F:      scripts/dtc/
 
 OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS
 M:     Rob Herring <robh+dt@kernel.org>
+M:     Krzysztof Kozlowski <krzk+dt@kernel.org>
 L:     devicetree@vger.kernel.org
 S:     Maintained
 C:     irc://irc.libera.chat/devicetree
@@ -18874,6 +18877,7 @@ SYNOPSYS DESIGNWARE I2C DRIVER
 M:     Jarkko Nikula <jarkko.nikula@linux.intel.com>
 R:     Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 R:     Mika Westerberg <mika.westerberg@linux.intel.com>
+R:     Jan Dabros <jsd@semihalf.com>
 L:     linux-i2c@vger.kernel.org
 S:     Maintained
 F:     drivers/i2c/busses/i2c-designware-*
@@ -19902,6 +19906,11 @@ W:     http://linuxtv.org
 T:     git git://linuxtv.org/media_tree.git
 F:     drivers/media/pci/tw686x/
 
+U-BOOT ENVIRONMENT VARIABLES
+M:     Rafał Miłecki <rafal@milecki.pl>
+S:     Maintained
+F:     Documentation/devicetree/bindings/nvmem/u-boot,env.yaml
+
 UACCE ACCELERATOR FRAMEWORK
 M:     Zhangfei Gao <zhangfei.gao@linaro.org>
 M:     Zhou Wang <wangzhou1@hisilicon.com>
@@ -20004,6 +20013,7 @@ R:      Alim Akhtar <alim.akhtar@samsung.com>
 R:     Avri Altman <avri.altman@wdc.com>
 L:     linux-scsi@vger.kernel.org
 S:     Supported
+F:     Documentation/devicetree/bindings/ufs/
 F:     Documentation/scsi/ufs.rst
 F:     drivers/scsi/ufs/
 
@@ -21511,7 +21521,6 @@ M:      George Cherian <gcherian@marvell.com>
 L:     linux-i2c@vger.kernel.org
 S:     Supported
 W:     http://www.marvell.com
-F:     Documentation/devicetree/bindings/i2c/i2c-xlp9xx.txt
 F:     drivers/i2c/busses/i2c-xlp9xx.c
 
 XRA1403 GPIO EXPANDER