Merge git://git.linux-mips.org/pub/scm/ralf/upstream-linus