From: Linus Torvalds Date: Tue, 9 Oct 2007 19:38:44 +0000 (-0700) Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5df3e0d953c8af6f5b96aa090824b929cb5ab599;p=linux-beck.git 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. --- 5df3e0d953c8af6f5b96aa090824b929cb5ab599