projects
/
platform
/
kernel
/
linux-3.10.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
11f9b02
fd3d276
)
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
author
Linus Torvalds
<torvalds@linux-foundation.org>
Mon, 6 Oct 2008 21:27:39 +0000
(14:27 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Mon, 6 Oct 2008 21:27:39 +0000
(14:27 -0700)
* '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.
Trivial merge