Merge "ARM: local timers: Add A15 architected timer support" into msm-3.0