Merge branch 'next-samsung' of git://git.fluff.org/bjdooks/linux