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