Merge branch 'depends/rmk/clkdev' into next/clock