Merge tag 'samsung-fixes-4.1-4' of https://github.com/krzk/linux into fixes