2cea71b8
parent ec7080d185a9b79581bf1dbe300e877719c0b1a9
author Linus Torvalds <torvalds@woody.osdl.org> 1164242193 -0800
committer Linus Torvalds <torvalds@woody.osdl.org> 1164242193 -0800

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/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