Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 9 Oct 2007 19:38:44 +0000 (12:38 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 9 Oct 2007 19:38:44 +0000 (12:38 -0700)
commit5df3e0d953c8af6f5b96aa090824b929cb5ab599
tree5ec703d42ebd1fa92150d110d4ce47d7891bf2cd
parenta6d85430424d44e946e0946bfaad607115510989
parent2da23247935526da567e18caddb4533cfa194aa9
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Au1000: set the PCI controller IO base
  [MIPS] Alchemy: Fix USB initialization.
  [MIPS] IP32: Fix fatal typo in address computation.