From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 10 Jan 2006 17:00:55 +0000 (-0800)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: firefly_0821_release~39198
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d936cfc72032fb4af03d1edd99596d18ea1f081c;p=firefly-linux-kernel-4.4.55.git

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

d936cfc72032fb4af03d1edd99596d18ea1f081c