Merge branch 'heads/dt-timers-for-v3.17' into next
Merge branch 'heads/shdma-for-v3.17' into next