Merge branch 'for-linus-clk' of git://ftp.arm.linux.org.uk/~rmk/linux-arm