commit cfe9930e9468e6fe871bca9a7db5c9e2ee10f6bb
author Arnd Bergmann <arnd@arndb.de> Fri Feb 15 17:42:31 2019 +0100
committer Arnd Bergmann <arnd@arndb.de> Fri Feb 15 20:38:15 2019 +0100
tree 9844d395e57056d69c7ff4c3ac418958b2540955
parent b8961b1eb7d2d6a28b9a51294b0b18aaa5f10d52
parent b3077ffcfa24b05c05af3b990d97a392ef88b22e

Merge tag 'amlogic-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/fixes

Amlogic SoC Kconfig updates for v5.1:
- arm64: meson: enable g12a clock controller
- drop unneeded COMMON_CLK_AMLOGIC

* tag 'amlogic-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  arm64: meson: enable g12a clock controller
  ARM: meson: remove COMMON_CLK_AMLOGIC selection
  arm64: meson: remove COMMON_CLK_AMLOGIC selection

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