]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit9737db350ae176c58fc5d39dec8f9f0894256c9c
tree0faa07be3679b78b01b925e5f959cbdcdf86ff3a
parent1dbdc62a5dacaf82d5a81e23d85a0ed4e6764726
parent7b825388c967e6b087c3227ccfd49a300add4c23
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] 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.