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