From: Linus Torvalds Date: Wed, 2 Dec 2009 23:39:20 +0000 (-0800) Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus X-Git-Tag: firefly_0821_release~11798 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=86a7b7ef54650b99f7f638d6a6990fe7c0dfaaab;p=firefly-linux-kernel-4.4.55.git Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: MIPS: RB532: Fix devices.c compilation. MIPS: Fix MIPS I build. --- 86a7b7ef54650b99f7f638d6a6990fe7c0dfaaab