Merge branch '4.1-fp' of git://git.linux-mips.org/pub/scm/ralf/upstream-sfr into...