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)
commitfc8b28a65d81a6fdf58ef81ce5b8ac7a35304e68
treed22d2d97d4b32d2428c2a8b7edcc6f4c36ee0433
parent3a4986955c0d9806e96a9d738ef7c40cb0cdaba3
parent8cfaf45367d41400ce99e1757ab5690d1fc94dbc
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] IP32: Enable PCI bridges