Merge branch '4.2-fixes' into mips-for-linux-next