Merge branch 'clockevents/cmt-mtu2-tmu-cleanups' into clockevents/3.16