Skip to content
Commit 37179033 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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.
parents 78dc6663 f2a89d3b
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment