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