Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 6 Oct 2008 21:27:39 +0000 (14:27 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 6 Oct 2008 21:27:39 +0000 (14:27 -0700)
commitba9b0c11285bcdaa3243c4123e924094b626c740
treee14fcd2d2cd791ec3ada3700e5bc10863bf8abec
parent11f9b020fa921bb33fff65b947f6422fe15f4414
parentfd3d2764ee5aad862e51c21b8239561acdea8c2f
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.