Merge branch 'clk-at91' into clk-next