tree 172582ed1e24905baad97c3390c3d03e8a6c1c50
parent b975dee3811ae0c58bd0e19cbd041cac8dd37ec5
parent 4a911b1efe219fa3c8af697be0054c72e13bdae4
author Linus Torvalds <torvalds@linux-foundation.org> 1220986354 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1220986354 -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] IP22: Fix detection of second HPC3 on Challenge S