From: Olof Johansson Date: Mon, 26 May 2014 20:41:02 +0000 (-0700) Subject: Merge tag 'berlin-soc-3.16' of https://github.com/shesselba/linux-berlin into next/soc X-Git-Tag: firefly_0821_release~176^2~3465^2~47^2~10 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e469d6ba0ac0b75f6cd762fc497d35dec0d11fc2;p=firefly-linux-kernel-4.4.55.git Merge tag 'berlin-soc-3.16' of https://github.com/shesselba/linux-berlin into next/soc Merge "ARM: berlin: SoC changes for v3.16" from Sebastian Hesselbart: Despite relatively young Berlin SoC support, we already have support for a BG2Q SoC provided by Alexandre Belloni and Antoine Tenart. Also, we gained support for DW gpio and a pinctrl driver. * tag 'berlin-soc-3.16' of https://github.com/shesselba/linux-berlin: ARM: berlin: add the pinctrl dependency for the Marvell Berlin SoCs ARM: berlin: add the LIBGPIO as a dependency for the BG2Q ARM: berlin: add MACH_BERLIN_BG2Q symbol ARM: berlin: add Marvell Armada 1500 pro to Marvell doc Signed-off-by: Olof Johansson --- e469d6ba0ac0b75f6cd762fc497d35dec0d11fc2