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.
This commit is contained in:
Arnd Bergmann 2016-09-14 22:48:29 +02:00
commit 37179033fc
11 changed files with 44 additions and 44 deletions