From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 18 Dec 2010 18:23:29 +0000 (-0800)
Subject: Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: firefly_0821_release~7613^2~3222
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2ba16c4f456eb63f54b1d8b065377d41a1cd6a14;p=firefly-linux-kernel-4.4.55.git

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

* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus:
  MIPS: Fix build errors in sc-mips.c
---

2ba16c4f456eb63f54b1d8b065377d41a1cd6a14