Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus