Merge tag 'v4.7-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Wed, 13 Apr 2016 22:30:20 +0000 (15:30 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 13 Apr 2016 22:30:20 +0000 (15:30 -0700)
commite24f89e37bee8a11050ce87293814e2c86e3b330
tree343b98254c674c3a82ce791ba6729d55acf275bb
parent56a0eccdc0dec223d4625c80de31514f04390159
parent40ac568d0ef07b60ba8cc0f2e88ccdd4dd0e176a
Merge tag 'v4.7-rockchip-dts64-1' of git://git./linux/kernel/git/mmind/linux-rockchip into next/dt64

This contains the rk3368-geekbox as new board, mailbox device
nodes for the core rk3368 and some cleanups for gpio-keys,
mmc and tsadc.

* tag 'v4.7-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  Documentation: devicetree: rockchip: Document rk3368-GeekBox
  arm64: dts: rockchip: Add rk3368 GeekBox dts
  arm64: dts: rockchip: Clean up gpio-keys nodes
  dt-bindings: Add vendor prefix for GeekBuying.com
  arm64: dts: rockchip: Add rk3368 mailbox device nodes
  arm64: dts: rockchip: remove broken-cd from emmc and sdio
  arm64: dts: rockchip: fix the incorrect otp-out pin on rk3368

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