Merge branch 'samsung-fixes-2' of git://github.com/kgene/linux-samsung into HEAD