Merge branch 'for_rmk' of git://git.mnementh.co.uk/linux-2.6-im into devel