diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-05-20 17:41:15 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-20 17:41:15 +0200 |
| commit | e0f8864fb4ac0bdf5633c3ff8064d2c775af64f4 (patch) | |
| tree | 02d4197a42d372f2147519a9263c607d8a412adb /tools/perf/scripts/python/export-to-postgresql.py | |
| parent | 80f3e6557e43ee795e4060d8ae033a26d415cd8b (diff) | |
| parent | ef6ca1a84a3da9bf45d31399090153e00fc6cd68 (diff) | |
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
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions