Merge branch 'samsung-fixes-4' of git://github.com/kgene/linux-samsung