tree 5ec703d42ebd1fa92150d110d4ce47d7891bf2cd
parent a6d85430424d44e946e0946bfaad607115510989
parent 2da23247935526da567e18caddb4533cfa194aa9
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1191958724 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1191958724 -0700

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