| commit | ba9b0c11285bcdaa3243c4123e924094b626c740 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Oct 06 14:27:39 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Oct 06 14:27:39 2008 -0700 |
| tree | e14fcd2d2cd791ec3ada3700e5bc10863bf8abec | |
| parent | 11f9b020fa921bb33fff65b947f6422fe15f4414 [diff] | |
| parent | fd3d2764ee5aad862e51c21b8239561acdea8c2f [diff] |
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.