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