Merge branch 'master' of http://ftp.arm.linux.org.uk/pub/armlinux/kernel/git-cur...