diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-30 17:35:12 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-30 17:35:12 +0100 |
commit | a06c39d2577cda7d7a1baaa45c29e6f24000a2a0 (patch) | |
tree | 0faa07be3679b78b01b925e5f959cbdcdf86ff3a /arch/sparc/kernel | |
parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 (diff) | |
parent | [MIPS] Fix typo of "CONFIG_MT_SMP". (diff) | |
download | linux-a06c39d2577cda7d7a1baaa45c29e6f24000a2a0.tar.xz linux-a06c39d2577cda7d7a1baaa45c29e6f24000a2a0.zip |
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/sparc/kernel')
0 files changed, 0 insertions, 0 deletions