Merge tag 'sti-soc-for-v3.20-1' of git://git.stlinux.com/devel/kernel/linux-sti into...
authorOlof Johansson <olof@lixom.net>
Wed, 21 Jan 2015 23:23:24 +0000 (15:23 -0800)
committerOlof Johansson <olof@lixom.net>
Wed, 21 Jan 2015 23:23:24 +0000 (15:23 -0800)
Merge "ARM: STi: SoC changes for v3.20, round 1" from Maxime Coquelin:

Highlights:
-----------
 - Add support for STiH418 SoC

* tag 'sti-soc-for-v3.20-1' of git://git.stlinux.com/devel/kernel/linux-sti:
  ARM: STi: Add STiH418 SoC support

Signed-off-by: Olof Johansson <olof@lixom.net>

Trivial merge