Merge branch 's3c24xx-updates' of git://git.fluff.org/bjdooks/linux