]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b8961b1 b3077ff)
Merge tag 'amlogic-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman...
authorArnd Bergmann <arnd@arndb.de>
Fri, 15 Feb 2019 16:42:31 +0000 (17:42 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 15 Feb 2019 19:38:15 +0000 (20:38 +0100)
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>
1  2 
arch/arm64/Kconfig.platforms patch | diff1 | diff2 | blob | history

diff --cc arch/arm64/Kconfig.platforms
Simple merge
local clone of linux.git