Merge tag 'zynq-soc-for-4.5' of https://github.com/Xilinx/linux-xlnx into next/soc
authorOlof Johansson <olof@lixom.net>
Tue, 22 Dec 2015 19:28:30 +0000 (11:28 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 22 Dec 2015 19:28:30 +0000 (11:28 -0800)
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>

Trivial merge