]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b9b8e3e e469d6b)
Merge branch 'next/soc' into for-next
authorOlof Johansson <olof@lixom.net>
Mon, 26 May 2014 20:43:34 +0000 (13:43 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 26 May 2014 20:43:34 +0000 (13:43 -0700)
* next/soc:
  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


Trivial merge
Linux kernel for KaRo TX COM modules