Commit 4bdfafd6 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-arm-5.11-1' of...

Merge tag 'mvebu-arm-5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into arm/soc

mvebu arm for 5.11 (part 1)

Update MAINTAINER file:
 - add new 98DX3236 based boards
 - point new git repository for mvebu

* tag 'mvebu-arm-5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu:
  MAINTAINERS: switch mvebu tree to kernel.org
  MAINTAINERS: Add an entry for MikroTik CRS3xx 98DX3236 boards

Link: https://lore.kernel.org/r/87k0u2j0n7.fsf@BL-laptop


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 2efc35dc d7ce8739
Loading
Loading
Loading
Loading
+13 −2
Original line number Diff line number Diff line
@@ -2019,7 +2019,7 @@ M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
M:	Gregory Clement <gregory.clement@bootlin.com>
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S:	Maintained
T:	git git://git.infradead.org/linux-mvebu.git
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git
F:	Documentation/devicetree/bindings/soc/dove/
F:	arch/arm/boot/dts/dove*
F:	arch/arm/boot/dts/orion5x*
@@ -2036,7 +2036,7 @@ M: Gregory Clement <gregory.clement@bootlin.com>
M:	Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S:	Maintained
T:	git git://git.infradead.org/linux-mvebu.git
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git
F:	arch/arm/boot/dts/armada*
F:	arch/arm/boot/dts/kirkwood*
F:	arch/arm/configs/mvebu_*_defconfig
@@ -11626,6 +11626,17 @@ M: Oliver Neukum <oliver@neukum.org>
S:	Maintained
F:	drivers/usb/image/microtek.*
MIKROTIK CRS3XX 98DX3236 BOARD SUPPORT
M:	Luka Kovacic <luka.kovacic@sartura.hr>
M:	Luka Perkov <luka.perkov@sartura.hr>
S:	Maintained
F:	arch/arm/boot/dts/armada-xp-crs305-1g-4s-bit.dts
F:	arch/arm/boot/dts/armada-xp-crs305-1g-4s.dts
F:	arch/arm/boot/dts/armada-xp-crs326-24g-2s-bit.dts
F:	arch/arm/boot/dts/armada-xp-crs326-24g-2s.dts
F:	arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s-bit.dts
F:	arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s.dts
MIPS
M:	Thomas Bogendoerfer <tsbogend@alpha.franken.de>
L:	linux-mips@vger.kernel.org