diff options
author | Olof Johansson <olof@lixom.net> | 2014-05-27 00:41:02 +0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-05-27 00:41:02 +0400 |
commit | e469d6ba0ac0b75f6cd762fc497d35dec0d11fc2 (patch) | |
tree | bf074f49dc211119e50a9b0ea20b7aae83ce3e03 /arch/arm/include/debug | |
parent | 2ca602de42863436cce275dde35c22496344d539 (diff) | |
parent | 03dac26a831c51e544dc95ba12ea9e3520829e7e (diff) | |
download | linux-e469d6ba0ac0b75f6cd762fc497d35dec0d11fc2.tar.xz |
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 <olof@lixom.net>
Diffstat (limited to 'arch/arm/include/debug')
0 files changed, 0 insertions, 0 deletions