diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 16:33:14 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 16:33:14 -0400 |
| commit | da206c9e68cb93fcab43592d46276c02889c1250 (patch) | |
| tree | 21264cc26fa0322d668b398808f10bd93558d25f /arch/i386/kernel/cpu | |
| parent | 916d15445f4ad2a9018e5451760734f36083be77 (diff) | |
| parent | 2e2d0dcc1bd7ca7c26ea5e29efb7f34bbd564f1c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
typo fixes
Clean up 'inline is not at beginning' warnings for usb storage
Storage class should be first
i386: Trivial typo fixes
ixj: make ixj_set_tone_off() static
spelling fixes
fix paniced->panicked typos
Spelling fixes for Documentation/atomic_ops.txt
move acknowledgment for Mark Adler to CREDITS
remove the bouncing email address of David Campbell
Diffstat (limited to 'arch/i386/kernel/cpu')
| -rw-r--r-- | arch/i386/kernel/cpu/cyrix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/cpu/cyrix.c b/arch/i386/kernel/cpu/cyrix.c index fc32c8028e24..f03b7f94c304 100644 --- a/arch/i386/kernel/cpu/cyrix.c +++ b/arch/i386/kernel/cpu/cyrix.c | |||
| @@ -354,7 +354,7 @@ static void __init init_nsc(struct cpuinfo_x86 *c) | |||
| 354 | * This function only handles the GX processor, and kicks every | 354 | * This function only handles the GX processor, and kicks every |
| 355 | * thing else to the Cyrix init function above - that should | 355 | * thing else to the Cyrix init function above - that should |
| 356 | * cover any processors that might have been branded differently | 356 | * cover any processors that might have been branded differently |
| 357 | * after NSC aquired Cyrix. | 357 | * after NSC acquired Cyrix. |
| 358 | * | 358 | * |
| 359 | * If this breaks your GX1 horribly, please e-mail | 359 | * If this breaks your GX1 horribly, please e-mail |
| 360 | * info-linux@ldcmail.amd.com to tell us. | 360 | * info-linux@ldcmail.amd.com to tell us. |