Merge tag 'mvebu-soc-4.20-1' of git://git.infradead.org/linux-mvebu into next/soc

Browse source

mvebu soc for 4.20 (part 1)

 - use dt_fixup to provide fallback for enable-method for Armada XP
 - document the marvell,prestera compatible string
 - update Thomas Petazzoni email in MAINTAINERS file

* tag 'mvebu-soc-4.20-1' of git://git.infradead.org/linux-mvebu:
  dt-bindings: marvell,prestera: Add common compatible string
  MAINTAINERS: replace free-electrons.com by bootlin.com for Thomas Petazzoni
  ARM: mvebu: use dt_fixup to provide fallback for enable-method

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

...

This commit is contained in:

Arnd Bergmann 2018-10-01 16:02:56 +02:00

parent 1c15f655d1 40ad192f9e

commit 7ab78d02ca

3 changed files with 14 additions and 12 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

Documentation/devicetree/bindings/net/marvell,prestera.txt

View file

8

MAINTAINERS

View file

14

arch/arm/mach-mvebu/board-v7.c

View file