diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-11-27 17:41:48 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-11-27 17:41:48 +0100 |
| commit | a405fd1b1fd2f96ab7c57a600d3c21f4eae6882c (patch) | |
| tree | fe19a068660eb9721ccd9d891238a32e36203ce2 /fs | |
| parent | 5530f8517129150bf915592ed7654ec7fbd72943 (diff) | |
| parent | 784359b824bf2b095b257eefcd9615a3c48f2d8a (diff) | |
| download | linux-a405fd1b1fd2f96ab7c57a600d3c21f4eae6882c.tar.bz2 | |
Merge tag 'v4.4-rockchip-dts32-fixes1' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions