]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
Merge tag 'mvebu-arm64-4.7-1' of git://git.infradead.org/linux-mvebu into next/arm64
authorArnd Bergmann <arnd@arndb.de>
Tue, 10 May 2016 12:53:01 +0000 (14:53 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 10 May 2016 12:53:01 +0000 (14:53 +0200)
Merge "mvebu arm64 for 4.7" from Gregory CLEMENT:

- Mention the arm64 SoCs in the MAINTAINER file
- Enable syscon drivers for Marvell Armada 7K/8K (replacing the clk
  one)

* tag 'mvebu-arm64-4.7-1' of git://git.infradead.org/linux-mvebu:
  MAINTAINERS: update entry for Marvell ARM platform maintainers
  arm64: marvell: enable AP806 and CP110 syscon driver

1  2 
MAINTAINERS
arch/arm64/Kconfig.platforms

diff --cc MAINTAINERS
Simple merge
Simple merge