]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 08456d1 9616d54)
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 30 Jan 2007 16:35:12 +0000 (08:35 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 30 Jan 2007 16:35:12 +0000 (08:35 -0800)
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Fix typo of "CONFIG_MT_SMP".
  [MIPS] Ocelot G: Fix a few misspellings of CONFIG_GALILEO_GT64240_ETH
  [PATCH] Malta: Fix build if CONFIG_MTD is diabled.


Trivial merge
Linux 2.6 source tree