diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-30 08:35:12 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-30 08:35:12 -0800 |
commit | a06c39d2577cda7d7a1baaa45c29e6f24000a2a0 (patch) | |
tree | 0faa07be3679b78b01b925e5f959cbdcdf86ff3a /arch/alpha | |
parent | 08456d10a6bc208bafced4f7b4090abccfb594da (diff) | |
parent | 9616d54fffa4c9ae78136cc6d01209de2d92b75d (diff) |
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.
Diffstat (limited to 'arch/alpha')
0 files changed, 0 insertions, 0 deletions