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/call-graph-from-postgresql.py | |
| parent | ARM: uniphier: only select TWD for SMP (diff) | |
| parent | ARM: zynq: Drop use of slcr_unlock in zynq_slcr_system_restart (diff) | |
| download | linux-dev-e0f8864fb4ac0bdf5633c3ff8064d2c775af64f4.tar.xz linux-dev-e0f8864fb4ac0bdf5633c3ff8064d2c775af64f4.zip | |
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/call-graph-from-postgresql.py')
0 files changed, 0 insertions, 0 deletions