tree d22d2d97d4b32d2428c2a8b7edcc6f4c36ee0433
parent 3a4986955c0d9806e96a9d738ef7c40cb0cdaba3
parent 8cfaf45367d41400ce99e1757ab5690d1fc94dbc
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1191710836 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1191710836 -0700

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] IP32: Enable PCI bridges