Merge branch 'for-rmk-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux