From: Arnd Bergmann Date: Wed, 16 Aug 2017 20:41:23 +0000 (+0200) Subject: Merge tag 'gemini-for-arm-soc-1' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v4.14-rc1~68^2~8 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=d4e508c298f36e7b48872cba49c81ec4f329d504;p=linux.git Merge tag 'gemini-for-arm-soc-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/soc Pull "Gemini changes for v4.14" from Linus Walleij: They all deal with fixing up the Kconfig selects for misc stuff that has been merged in different subsystems: - We have a reset controller - We have a clock controller - We need ARM_AMBA for FTDMAC020 which is PL08x - We need to select the pin controller (being merged for v4.14) * tag 'gemini-for-arm-soc-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik: ARM: gemini: select pin controller ARM: gemini: select ARM_AMBA ARM: gemini: select the clock controller ARM: gemini: tag the arch as having reset controller --- d4e508c298f36e7b48872cba49c81ec4f329d504