From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sat, 6 Oct 2007 22:47:16 +0000 (-0700)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: v2.6.23~22
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc8b28a65d81a6fdf58ef81ce5b8ac7a35304e68;p=linux-2.6

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
---

fc8b28a65d81a6fdf58ef81ce5b8ac7a35304e68