From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 15 Jan 2008 05:25:39 +0000 (-0800)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: v3.12-rc1~24210
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c60ecec67ab3f6b5791ef49d502b7a61909aa13e;p=kernel%2Fkernel-generic.git

Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Cacheops.h: Fix typo.
  [MIPS] Cobalt: Qube1 has no serial port so don't use it
  [MIPS] Cobalt: Fix ethernet interrupts for RaQ1
  [MIPS] Kconfig fixes for BCM47XX platform
---

c60ecec67ab3f6b5791ef49d502b7a61909aa13e