Merge topic branches 'clkdev' and 'fixes' into for-linus