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