From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 9 Sep 2008 18:52:34 +0000 (-0700)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: v2.6.27-rc6~6
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b1fc335d2f2c1206ac4048e5f6d8971f2aae6be;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] IP22: Fix detection of second HPC3 on Challenge S
---

0b1fc335d2f2c1206ac4048e5f6d8971f2aae6be