Merge branch 'for_rmk_17' of git://git.mnementh.co.uk/linux-2.6-im