Merge branch 's3c-moves2' of git://aeryn.fluff.org.uk/bjdooks/linux into devel