From: Olof Johansson <olof@lixom.net>
Date: Tue, 22 Dec 2015 19:28:30 +0000 (-0800)
Subject: Merge tag 'zynq-soc-for-4.5' of https://github.com/Xilinx/linux-xlnx into next/soc
X-Git-Tag: v4.14-rc1~3963^2~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f877df2bcf916ce76851b0f0a669512aa8183446;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'zynq-soc-for-4.5' of https://github.com/Xilinx/linux-xlnx into next/soc

arm: Xilinx Zynq patches for v4.5

- Select reset controller by default for Zynq

* tag 'zynq-soc-for-4.5' of https://github.com/Xilinx/linux-xlnx:
  ARM: zynq: Select ARCH_HAS_RESET_CONTROLLER

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

f877df2bcf916ce76851b0f0a669512aa8183446