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