git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a6d8543 2da2324)
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)
* '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.


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.