From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 6 Oct 2008 21:27:39 +0000 (-0700)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=ba9b0c11285bcdaa3243c4123e924094b626c740;p=openwrt%2Fstaging%2Fblogic.git

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

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] IP27: Fix build errors if CONFIG_MAPPED_KERNEL=y
  [MIPS] Fix CMP Kconfig configuration and mark as broken.
---

ba9b0c11285bcdaa3243c4123e924094b626c740