Merge tag 'v4.4-rockchip-dts32-fixes1' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Fri, 27 Nov 2015 16:41:48 +0000 (17:41 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 27 Nov 2015 16:41:48 +0000 (17:41 +0100)
commita405fd1b1fd2f96ab7c57a600d3c21f4eae6882c
treefe19a068660eb9721ccd9d891238a32e36203ce2
parent5530f8517129150bf915592ed7654ec7fbd72943
parent784359b824bf2b095b257eefcd9615a3c48f2d8a
Merge tag 'v4.4-rockchip-dts32-fixes1' of git://git./linux/kernel/git/mmind/linux-rockchip into fixes

Merge "ARM: rockchip: devicetree fixes for 4.4" from Heiko Stuebner:

Two fixes to Rockchip devicetree files, disabling the mmc-tuning
on the veyron-minnie board for now and adding the init state for
the over-temperature-protection to prevent glitches making the
system reboot sometimes.

* tag 'v4.4-rockchip-dts32-fixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: Add OTP gpio pinctrl to rk3288 tsadc node
  ARM: dts: rockchip: temporarily remove emmc hs200 speed from rk3288 minnie