]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge tag 'mvebu-dt-3.17-4' of git://git.infradead.org/linux-mvebu into next/dt
authorArnd Bergmann <arnd@arndb.de>
Mon, 28 Jul 2014 14:51:02 +0000 (16:51 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 28 Jul 2014 14:51:02 +0000 (16:51 +0200)
commit4fd1f229c2bc39b7f35f2a9f9fb9892f2d665359
tree42ec16964cd95870504dff19c3893b6f4d37b897
parent1c607f0af075f676d3e138e94d46ba44e15c0f5f
parent40c2da45366171bdc9ad1968489aaae190248383
Merge tag 'mvebu-dt-3.17-4' of git://git.infradead.org/linux-mvebu into next/dt

Merge "mvebu DT changes for v3.17 (round 4)" from Jason Cooper"

 - Armada XP
    - New board, Lenovo ix4-300d NAS
    - Add Lenovo to vendor-prefixes

 - Dove
    - Add LCD controllers

* tag 'mvebu-dt-3.17-4' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: Add dts definition for Lenovo Iomega ix4-300d NAS
  of: Add Lenovo Group Ltd. to the vendor-prefixes list.
  ARM: dts: dove: add DT LCD controllers

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Documentation/devicetree/bindings/vendor-prefixes.txt
arch/arm/boot/dts/Makefile