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