diff options
author | 2016-09-14 22:48:29 +0200 | |
---|---|---|
committer | 2016-09-14 22:48:29 +0200 | |
commit | 37179033fc98156ce5cd360ff658da3e1fb01a56 (patch) | |
tree | 87694304b2850605fb225aac186b6d8cd5072659 /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Merge tag 'zynqmp-dt-for-4.9' of https://github.com/Xilinx/linux-xlnx into next/dt64 (diff) | |
parent | arm64: dts: Fix broken architected timer interrupt trigger (diff) | |
download | linux-dev-37179033fc98156ce5cd360ff658da3e1fb01a56.tar.xz linux-dev-37179033fc98156ce5cd360ff658da3e1fb01a56.zip |
Merge branch 'dt/irq-fix' into next/dt64
* dt/irq-fix:
arm64: dts: Fix broken architected timer interrupt trigger
This resolves a non-obvious conflict between a bugfix from
v4.8 and a cleanup for the exynos7 platform.
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions