diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 10:58:52 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 10:58:52 -0500 |
commit | f5bb3a5e9dcdb8435471562b6cada89525cf4df1 (patch) | |
tree | 7b7cf9b90bacd0e2fe07cb3387516e9243f1ab66 /arch/x86 | |
parent | 9853832c49dc1685587abeb4e1decd4be690d256 (diff) | |
parent | 1560a79a2c2ea0c3826150da8029991d685de990 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (79 commits)
Jesper Juhl is the new trivial patches maintainer
Documentation: mention email-clients.txt in SubmittingPatches
fs/binfmt_elf.c: spello fix
do_invalidatepage() comment typo fix
Documentation/filesystems/porting fixes
typo fixes in net/core/net_namespace.c
typo fix in net/rfkill/rfkill.c
typo fixes in net/sctp/sm_statefuns.c
lib/: Spelling fixes
kernel/: Spelling fixes
include/scsi/: Spelling fixes
include/linux/: Spelling fixes
include/asm-m68knommu/: Spelling fixes
include/asm-frv/: Spelling fixes
fs/: Spelling fixes
drivers/watchdog/: Spelling fixes
drivers/video/: Spelling fixes
drivers/ssb/: Spelling fixes
drivers/serial/: Spelling fixes
drivers/scsi/: Spelling fixes
...
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/Kconfig | 3 | ||||
-rw-r--r-- | arch/x86/lib/bitops_32.c | 2 | ||||
-rw-r--r-- | arch/x86/lib/bitops_64.c | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 3162cb467ab3..99af1272ab1d 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -202,8 +202,7 @@ config SMP | |||
202 | Y to "Enhanced Real Time Clock Support", below. The "Advanced Power | 202 | Y to "Enhanced Real Time Clock Support", below. The "Advanced Power |
203 | Management" code will be disabled if you say Y here. | 203 | Management" code will be disabled if you say Y here. |
204 | 204 | ||
205 | See also the <file:Documentation/smp.txt>, | 205 | See also <file:Documentation/i386/IO-APIC.txt>, |
206 | <file:Documentation/i386/IO-APIC.txt>, | ||
207 | <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO available at | 206 | <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO available at |
208 | <http://www.tldp.org/docs.html#howto>. | 207 | <http://www.tldp.org/docs.html#howto>. |
209 | 208 | ||
diff --git a/arch/x86/lib/bitops_32.c b/arch/x86/lib/bitops_32.c index afd0045595d4..b65440459859 100644 --- a/arch/x86/lib/bitops_32.c +++ b/arch/x86/lib/bitops_32.c | |||
@@ -2,7 +2,7 @@ | |||
2 | #include <linux/module.h> | 2 | #include <linux/module.h> |
3 | 3 | ||
4 | /** | 4 | /** |
5 | * find_next_bit - find the first set bit in a memory region | 5 | * find_next_bit - find the next set bit in a memory region |
6 | * @addr: The address to base the search on | 6 | * @addr: The address to base the search on |
7 | * @offset: The bitnumber to start searching at | 7 | * @offset: The bitnumber to start searching at |
8 | * @size: The maximum size to search | 8 | * @size: The maximum size to search |
diff --git a/arch/x86/lib/bitops_64.c b/arch/x86/lib/bitops_64.c index 95b6d9639fba..0e8f491e6ccc 100644 --- a/arch/x86/lib/bitops_64.c +++ b/arch/x86/lib/bitops_64.c | |||
@@ -58,7 +58,7 @@ long find_first_zero_bit(const unsigned long * addr, unsigned long size) | |||
58 | } | 58 | } |
59 | 59 | ||
60 | /** | 60 | /** |
61 | * find_next_zero_bit - find the first zero bit in a memory region | 61 | * find_next_zero_bit - find the next zero bit in a memory region |
62 | * @addr: The address to base the search on | 62 | * @addr: The address to base the search on |
63 | * @offset: The bitnumber to start searching at | 63 | * @offset: The bitnumber to start searching at |
64 | * @size: The maximum size to search | 64 | * @size: The maximum size to search |