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