From: Olof Johansson Date: Fri, 23 Jan 2015 22:20:43 +0000 (-0800) Subject: Merge tag 'v3.20-next-soc1' of https://github.com/mbgg/linux-mediatek into next/soc X-Git-Tag: firefly_0821_release~176^2~2308^2~12 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=eeec0434e8b89fa5f29d71e5f8044dcec7939d1a;p=firefly-linux-kernel-4.4.55.git Merge tag 'v3.20-next-soc1' of https://github.com/mbgg/linux-mediatek into next/soc Merge "ARM: mediatek: soc changes for v3.20" from Matthias Brugger: This adds config options for the different Mediatek SoC. We need this so that the pinctrl driver does not bloat the kernel binary. Apart we change the Kconfig description and add the config option for mt6592 low-level debug option. * tag 'v3.20-next-soc1' of https://github.com/mbgg/linux-mediatek: ARM: mediatek: Low-level-debug for mt6592 ARM: mediatek: Add config options for mediatek SoCs. Signed-off-by: Olof Johansson --- eeec0434e8b89fa5f29d71e5f8044dcec7939d1a