| commit | 37179033fc98156ce5cd360ff658da3e1fb01a56 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Wed Sep 14 22:48:29 2016 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Wed Sep 14 22:48:29 2016 +0200 |
| tree | 87694304b2850605fb225aac186b6d8cd5072659 | |
| parent | 78dc6663a8c12e9d45e7862e3a2c83c68f4a06cf [diff] | |
| parent | f2a89d3b2b85b90b05453872aaabfdb412a21a03 [diff] |
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.