Merge branch 'fixes/2637-rc5/s3c24xx' of git://git.fluff.org/bjdooks/linux