From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 26 Feb 2007 19:40:46 +0000 (-0800)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: firefly_0821_release~30996
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=63ae0e5be34cb7593fc5f1135422129f765ac3ef;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] Fix port 0 mac address for mips mv6434x platforms
  [SERIAL] serial_txx9 driver update
  Revert "[PATCH] Generic ioremap_page_range: mips conversion"
  [MIPS] Cobalt: Rename "Colo" MTD partition to "firmware".
  [MIPS] SMP: Get smp_tune_scheduling to do something useful.
  [MIPS] Add basic SMARTMIPS ASE support
---

63ae0e5be34cb7593fc5f1135422129f765ac3ef