diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 23:36:17 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 23:36:17 -0400 |
| commit | c00046c279a2521075250fad682ca0acc10d4fd7 (patch) | |
| tree | 78a7e9089c26f199ad9b0161bb564b7c1ca6daf9 /arch/i386 | |
| parent | 9abbf7d028b1598b40ebdc81c48f30da7f3d5bf5 (diff) | |
| parent | 8e8a1407ac23b43cec0412338c1b4f5e1c664550 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (74 commits)
fix do_sys_open() prototype
sysfs: trivial: fix sysfs_create_file kerneldoc spelling mistake
Documentation: Fix typo in SubmitChecklist.
Typo: depricated -> deprecated
Add missing profile=kvm option to Documentation/kernel-parameters.txt
fix typo about TBI in e1000 comment
proc.txt: Add /proc/stat field
small documentation fixes
Fix compiler warning in smount example program from sharedsubtree.txt
docs/sysfs: add missing word to sysfs attribute explanation
documentation/ext3: grammar fixes
Documentation/java.txt: typo and grammar fixes
Documentation/filesystems/vfs.txt: typo fix
include/asm-*/system.h: remove unused set_rmb(), set_wmb() macros
trivial copy_data_pages() tidy up
Fix typo in arch/x86/kernel/tsc_32.c
file link fix for Pegasus USB net driver help
remove unused return within void return function
Typo fixes retrun -> return
x86 hpet.h: remove broken links
...
Diffstat (limited to 'arch/i386')
| -rw-r--r-- | arch/i386/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig index d1bedbf9deb8..f6e44fc5283c 100644 --- a/arch/i386/Kconfig +++ b/arch/i386/Kconfig | |||
| @@ -392,7 +392,7 @@ config X86_MCE_NONFATAL | |||
| 392 | will look at the machine check registers to see if anything happened. | 392 | will look at the machine check registers to see if anything happened. |
| 393 | Non-fatal problems automatically get corrected (but still logged). | 393 | Non-fatal problems automatically get corrected (but still logged). |
| 394 | Disable this if you don't want to see these messages. | 394 | Disable this if you don't want to see these messages. |
| 395 | Seeing the messages this option prints out may be indicative of dying hardware, | 395 | Seeing the messages this option prints out may be indicative of dying |
| 396 | or out-of-spec (ie, overclocked) hardware. | 396 | or out-of-spec (ie, overclocked) hardware. |
| 397 | This option only does something on certain CPUs. | 397 | This option only does something on certain CPUs. |
| 398 | (AMD Athlon/Duron and Intel Pentium 4) | 398 | (AMD Athlon/Duron and Intel Pentium 4) |
| @@ -631,7 +631,7 @@ config NUMA | |||
| 631 | default n if X86_PC | 631 | default n if X86_PC |
| 632 | default y if (X86_NUMAQ || X86_SUMMIT) | 632 | default y if (X86_NUMAQ || X86_SUMMIT) |
| 633 | help | 633 | help |
| 634 | NUMA support for i386. This is currently high experimental | 634 | NUMA support for i386. This is currently highly experimental |
| 635 | and should be only used for kernel development. It might also | 635 | and should be only used for kernel development. It might also |
| 636 | cause boot failures. | 636 | cause boot failures. |
| 637 | 637 | ||