summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2023-10-23 21:01:45 +0200
committerArnd Bergmann <arnd@arndb.de>2023-10-23 21:01:59 +0200
commit291c0d3a98afb7b863485215c241a851be9e3435 (patch)
tree9c2a3356b9baf08f928bf01e47562ae3aea8a51c
parenteaf16b92b18cec5584392172ee4c89f5cf471397 (diff)
parent1122a9c2ebe02435014a0f40dcc50f4333286f0f (diff)
downloadlinux-starfive-291c0d3a98afb7b863485215c241a851be9e3435.tar.gz
linux-starfive-291c0d3a98afb7b863485215c241a851be9e3435.tar.bz2
linux-starfive-291c0d3a98afb7b863485215c241a851be9e3435.zip
Merge tag 'mvebu-fixes-6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into arm/fixes
mvebu fixes for 6.6 (part 1) Update MAINTAINERS for eDPU board * tag 'mvebu-fixes-6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu: MAINTAINERS: uDPU: add remaining Methode boards MAINTAINERS: uDPU: make myself maintainer of it Link: https://lore.kernel.org/r/875y32abqe.fsf@BL-laptop Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--MAINTAINERS5
1 files changed, 3 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 7a7bd8bd80e9..74af70fcc719 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13845,9 +13845,10 @@ F: Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml
F: drivers/staging/media/meson/vdec/
METHODE UDPU SUPPORT
-M: Vladimir Vid <vladimir.vid@sartura.hr>
+M: Robert Marko <robert.marko@sartura.hr>
S: Maintained
-F: arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
+F: arch/arm64/boot/dts/marvell/armada-3720-eDPU.dts
+F: arch/arm64/boot/dts/marvell/armada-3720-uDPU.*
MHI BUS
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>