Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6