]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit64cc5aa00ebc453735c125a4a226e173d1a8bef9
treee14fcd2d2cd791ec3ada3700e5bc10863bf8abec
parentb93f3379bd9d18affaf870a571f7c1a9449fa39b
parente06768081e33f04a73d7ba93bd11a9bf8c223405
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.