Merge branches 'amba', 'cfi', 'clkdev' and 'misc' into for-linus