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
This commit is contained in:
Linus Torvalds 2008-09-09 11:52:34 -07:00
commit 0b1fc335d2