tree e14fcd2d2cd791ec3ada3700e5bc10863bf8abec
parent 11f9b020fa921bb33fff65b947f6422fe15f4414
parent fd3d2764ee5aad862e51c21b8239561acdea8c2f
author Linus Torvalds <torvalds@linux-foundation.org> 1223328459 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1223328459 -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] IP27: Fix build errors if CONFIG_MAPPED_KERNEL=y
  [MIPS] Fix CMP Kconfig configuration and mark as broken.