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