From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 20 May 2015 15:41:15 +0000 (+0200)
Subject: Merge tag 'zynq-soc-for-4.2' of https://github.com/Xilinx/linux-xlnx into next/soc
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e0f8864fb4ac0bdf5633c3ff8064d2c775af64f4;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

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

Merge "arm: Xilinx Zynq SoC patches for v4.2" from Michal Simek:

- Change SoC reset path
- Fix SLCR unlock scheme

* tag 'zynq-soc-for-4.2' of https://github.com/Xilinx/linux-xlnx:
  ARM: zynq: Drop use of slcr_unlock in zynq_slcr_system_restart
  ARM: zynq: Use restart_handler mechanism for slcr reset
---

e0f8864fb4ac0bdf5633c3ff8064d2c775af64f4