Merge tag 'clcd-nomadik' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

Pull "CLCD graphics on the Nomadik NHK15" from Linus Walleij:

* tag 'clcd-nomadik' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  ARM: dts: add the CLCD LCD display to the NHK15
  ARM: dts: add PMU to the NHK15 device tree
  ARM: nomadik: select MFD_SYSCON
  dt-bindings: Add TPO TPG110 binding
  dt-bindings: add vendor TPO
  ARM: dts: add STMPE PWM to the NHK15 device tree

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
Simple merge