projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commita06c39d2577cda7d7a1baaa45c29e6f24000a2a0
tree0faa07be3679b78b01b925e5f959cbdcdf86ff3atree | snapshot
parent08456d10a6bc208bafced4f7b4090abccfb594dacommit | diff
parent9616d54fffa4c9ae78136cc6d01209de2d92b75dcommit | diff
Merge branch 'upstream' of git://ftp.linux-mips.org/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.
John Crispins staging tree