From: Linus Torvalds <torvalds@woody.osdl.org>
Date: Thu, 23 Nov 2006 00:36:33 +0000 (-0800)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: firefly_0821_release~31522^2~20^2~51
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=490a6e245e36ce27e10c32e1c3129fd782d3d1f3;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:
  [PATCH] make au1xxx-ide compile again
  [MIPS] Hack for SB1 cache issues
---

490a6e245e36ce27e10c32e1c3129fd782d3d1f3