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