Merge branch 'fixes-s3c-2632-rc6' of git://git.fluff.org/bjdooks/linux