]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitfd2c4f14387281b7ad5491e8c44681f8ecb42346
tree02d4197a42d372f2147519a9263c607d8a412adb
parentb01f6f061d211137eaf6b3d2a242e6d534025920
parent30a6caca5ec330223d21ae1089c3ba6ceb75dab3
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