Merge branch 'clock-for-v3.17' into dt-for-v3.17