Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@woody.osdl.org>
Thu, 23 Nov 2006 00:36:33 +0000 (16:36 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Thu, 23 Nov 2006 00:36:33 +0000 (16:36 -0800)
commit490a6e245e36ce27e10c32e1c3129fd782d3d1f3
treeaa9aa577215f65fc775ced09a99d5ce02e02d2a5
parent66c669baa7d70b8d135da67f36c8dba12cea71b8
parentec7080d185a9b79581bf1dbe300e877719c0b1a9
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