From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 27 Nov 2015 16:41:48 +0000 (+0100)
Subject: Merge tag 'v4.4-rockchip-dts32-fixes1' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: firefly_0821_release~176^2~631^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a405fd1b1fd2f96ab7c57a600d3c21f4eae6882c;p=firefly-linux-kernel-4.4.55.git

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
---

a405fd1b1fd2f96ab7c57a600d3c21f4eae6882c