Merge tag 'v3.16-rockchip-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind...
authorOlof Johansson <olof@lixom.net>
Tue, 20 May 2014 05:02:16 +0000 (22:02 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 20 May 2014 05:02:16 +0000 (22:02 -0700)
commit80c2e8876c24cb9429a50962becb2408c8d89708
tree4ca8d2816f0df758a40d5287a8debe76df8a6507
parent61e810d36416effcfe25bbbba4f126c4b8462f3c
parent56f2b894dcf455ffd31bd2e8e96a074249aeb4ba
Merge tag 'v3.16-rockchip-dt' of git://git./linux/kernel/git/mmind/linux-rockchip into next/dt

Merge "ARM: rockchip: devicetree changes for v3.16" from Heiko Stübner:

Addition of missing board compatible names and their vendor-prefixes
as well as the dts portions of the pinctrl rework.

* tag 'v3.16-rockchip-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: convert pinctrl nodes to new bindings
  ARM: dts: rockchip: add root compatible properties
  of: add mundoreader and radxa vendor prefixes

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/boot/dts/rk3188.dtsi