Merge branches 'clkdev', 'fixes', 'misc' and 'sa1100-base' into for-linus