Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 6 Oct 2007 22:47:16 +0000 (15:47 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 6 Oct 2007 22:47:16 +0000 (15:47 -0700)
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] IP32: Enable PCI bridges


Trivial merge