From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 16 Aug 2017 21:34:15 +0000 (+0200)
Subject: Merge tag 'v4.14-rockchip-soc32-1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.14-rc1~68^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ecb09d40170a446dc36099dca35d569338134a5b;p=platform%2Fkernel%2Flinux-exynos.git

Merge tag 'v4.14-rockchip-soc32-1' of git://git./linux/kernel/git/mmind/linux-rockchip into next/soc

Pull "Rockchip soc32 changes for 4.14" from Heiko Stübner:

32bit arch changes for Rockchip socs containing enablement for ZONE_DMA
for LPAE builds due to the peripherals only being 32bit capable
and conversion to the exclusive reset controls in smp code.

* tag 'v4.14-rockchip-soc32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: rockchip: enable ZONE_DMA for non 64-bit capable peripherals
  ARM: rockchip: explicitly request exclusive reset control in smp code
---

ecb09d40170a446dc36099dca35d569338134a5b