commit | 5df3e0d953c8af6f5b96aa090824b929cb5ab599 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Tue Oct 09 12:38:44 2007 -0700 |
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Tue Oct 09 12:38:44 2007 -0700 |
tree | 5ec703d42ebd1fa92150d110d4ce47d7891bf2cd | |
parent | a6d85430424d44e946e0946bfaad607115510989 [diff] | |
parent | 2da23247935526da567e18caddb4533cfa194aa9 [diff] |
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.