Merge tag 'zynq-soc-for-4.2' of https://github.com/Xilinx/linux-xlnx into next/soc
authorArnd Bergmann <arnd@arndb.de>
Wed, 20 May 2015 15:41:15 +0000 (17:41 +0200)
committerArnd Bergmann <arnd@arndb.de>
Wed, 20 May 2015 15:41:15 +0000 (17:41 +0200)
commite0f8864fb4ac0bdf5633c3ff8064d2c775af64f4
tree02d4197a42d372f2147519a9263c607d8a412adb
parent80f3e6557e43ee795e4060d8ae033a26d415cd8b
parentef6ca1a84a3da9bf45d31399090153e00fc6cd68
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