Merge branch '4.1-fp' into mips-for-linux-next