From: Linus Torvalds Date: Sat, 14 Mar 2009 19:02:21 +0000 (-0700) Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus X-Git-Tag: firefly_0821_release~15300 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=326d8519fc97be186c55ac605c3a7c957c758ae1;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: Mark Eins: Fix configuration. MIPS: Fix TIF_32BIT undefined problem when seccomp is disabled --- 326d8519fc97be186c55ac605c3a7c957c758ae1