From: Linus Torvalds 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-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0b1fc335d2f2c1206ac4048e5f6d8971f2aae6be;p=linux-beck.git 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