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
  ...

34 files changed, 47 insertions, 54 deletions

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 9abcd5fd8969..01b10ab588a6 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -532,8 +532,8 @@ config SMP
           singleprocessor machines. On a singleprocessor machine, the kernel
           will run faster if you say N here.
 
-          See also the <file:Documentation/smp.txt>, and the SMP-HOWTO
-          available at <http://www.tldp.org/docs.html#howto>.
+          See also the SMP-HOWTO available at
+          <http://www.tldp.org/docs.html#howto>.
 
           If you don't know what to do here, say N.
 
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 36176f40dfdf..471637002e8b 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -635,8 +635,7 @@ config SMP
           processor machines. On a single processor machine, the kernel will
           run faster if you say N here.
 
-          See also the <file:Documentation/smp.txt>,
-          <file:Documentation/i386/IO-APIC.txt>,
+          See also <file:Documentation/i386/IO-APIC.txt>,
           <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO available at
           <http://www.linuxdoc.org/docs.html#howto>.
 
diff --git a/arch/arm/mach-pxa/corgi_ssp.c b/arch/arm/mach-pxa/corgi_ssp.c
index efba65edcd51..31706224a04c 100644
--- a/arch/arm/mach-pxa/corgi_ssp.c
+++ b/arch/arm/mach-pxa/corgi_ssp.c
@@ -32,7 +32,7 @@ static struct corgissp_machinfo *ssp_machinfo;
 /*
  * There are three devices connected to the SSP interface:
  *   1. A touchscreen controller (TI ADS7846 compatible)
- *   2. An LCD contoller (with some Backlight functionality)
+ *   2. An LCD controller (with some Backlight functionality)
  *   3. A battery monitoring IC (Maxim MAX1111)
  *
  * Each device uses a different speed/mode of communication.
diff --git a/arch/arm/mach-sa1100/collie_pm.c b/arch/arm/mach-sa1100/collie_pm.c
index 1e25b1d19fce..94620be7bfac 100644
--- a/arch/arm/mach-sa1100/collie_pm.c
+++ b/arch/arm/mach-sa1100/collie_pm.c
@@ -165,7 +165,7 @@ int collie_read_temp(void)
 
         ucb1x00_adc_enable(ucb);
         ucb1x00_io_write(ucb, COLLIE_TC35143_GPIO_TMP_ON, 0);
-        /* >1010 = battery removed, 460 = 22C ?, higer = lower temp ? */
+        /* >1010 = battery removed, 460 = 22C ?, higher = lower temp ? */
         voltage = ucb1x00_adc_read(ucb, UCB_ADC_INP_AD0, UCB_SYNC);
         ucb1x00_io_write(ucb, 0, COLLIE_TC35143_GPIO_TMP_ON);
         ucb1x00_adc_disable(ucb);
diff --git a/arch/arm/plat-s3c24xx/irq.c b/arch/arm/plat-s3c24xx/irq.c
index d486f5112569..ae2c5d7efc9d 100644
--- a/arch/arm/plat-s3c24xx/irq.c
+++ b/arch/arm/plat-s3c24xx/irq.c
@@ -47,7 +47,7 @@
  *                Mark IRQ_LCD valid
  *
  *   25-Jul-2005  Ben Dooks
- *                Split the S3C2440 IRQ code to seperate file
+ *                Split the S3C2440 IRQ code to separate file
 */
 
 #include <linux/init.h>
diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index 68380cb2ff88..bf0468cbe713 100644
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -79,7 +79,7 @@ config FRV_OUTOFLINE_ATOMIC_OPS
           Setting this option causes the FR-V atomic operations to be mostly
           implemented out-of-line.
 
-          See Documentation/fujitsu/frv/atomic-ops.txt for more information.
+          See Documentation/frv/atomic-ops.txt for more information.
 
 config HIGHMEM
         bool "High memory support"
diff --git a/arch/frv/kernel/entry.S b/arch/frv/kernel/entry.S
index f926c7094776..99046b1f51c8 100644
--- a/arch/frv/kernel/entry.S
+++ b/arch/frv/kernel/entry.S
@@ -253,7 +253,7 @@ __entry_kernel_external_interrupt_reentry:
         andi.p          gr5,#~PSR_ET,gr5
 
         # set CCCR.CC3 to Undefined to abort atomic-modify completion inside the kernel
-        # - for an explanation of how it works, see: Documentation/fujitsu/frv/atomic-ops.txt
+        # - for an explanation of how it works, see: Documentation/frv/atomic-ops.txt
         andi            gr25,#~0xc0,gr25
 
         sti             gr20,@(gr28,#REG_TBR)
@@ -445,7 +445,7 @@ __entry_kernel_softprog_interrupt_reentry:
         sti             gr22,@(sp,#REG_SP)
 
         # set CCCR.CC3 to Undefined to abort atomic-modify completion inside the kernel
-        # - for an explanation of how it works, see: Documentation/fujitsu/frv/atomic-ops.txt
+        # - for an explanation of how it works, see: Documentation/frv/atomic-ops.txt
         movsg           cccr,gr20
         andi            gr20,#~0xc0,gr20
         movgs           gr20,cccr
diff --git a/arch/frv/lib/atomic-ops.S b/arch/frv/lib/atomic-ops.S
index 545cd325ac57..ee0ac905fb08 100644
--- a/arch/frv/lib/atomic-ops.S
+++ b/arch/frv/lib/atomic-ops.S
@@ -1,7 +1,7 @@
 /* atomic-ops.S: kernel atomic operations
  *
  * For an explanation of how atomic ops work in this arch, see:
- *   Documentation/fujitsu/frv/atomic-ops.txt
+ *   Documentation/frv/atomic-ops.txt
  *
  * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
  * Written by David Howells (dhowells@redhat.com)
diff --git a/arch/h8300/platform/h8s/ints.c b/arch/h8300/platform/h8s/ints.c
index 551fd5f30d82..ac10b9783850 100644
--- a/arch/h8300/platform/h8s/ints.c
+++ b/arch/h8300/platform/h8s/ints.c
@@ -121,7 +121,7 @@ void __init init_IRQ(void)
                 printk("virtual vector at 0x%08lx\n",(unsigned long)ramvec);
 
 #if defined(CONFIG_GDB_DEBUG)
-        /* save orignal break vector */
+        /* save original break vector */
         break_vec = ramvec[TRAP3_VEC];
 #else
         break_vec = VECTOR(trace_break);
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index a0740fbd94d9..b0de1132dfc0 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -285,8 +285,8 @@ config SMP
           single processor systems.  On a single processor system, the kernel
           will run faster if you say N here.
 
-          See also the <file:Documentation/smp.txt> and the SMP-HOWTO
-          available at <http://www.tldp.org/docs.html#howto>.
+          See also the SMP-HOWTO available at
+          <http://www.tldp.org/docs.html#howto>.
 
           If you don't know what to do here, say N.
 
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index 12259759a2fe..795180b8fd8e 100644
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -303,8 +303,7 @@ config SMP
           Y to "Enhanced Real Time Clock Support", below. The "Advanced Power
           Management" code will be disabled if you say Y here.
 
-          See also the <file:Documentation/smp.txt>,
-          and the SMP-HOWTO available at
+          See also the SMP-HOWTO available at
           <http://www.linuxdoc.org/docs.html#howto>.
 
           If you don't know what to do here, say N.
diff --git a/arch/m32r/kernel/ptrace.c b/arch/m32r/kernel/ptrace.c
index ed4d0756c5db..9aa615d3a5b2 100644
--- a/arch/m32r/kernel/ptrace.c
+++ b/arch/m32r/kernel/ptrace.c
@@ -476,7 +476,7 @@ unregister_debug_trap(struct task_struct *child, unsigned long addr,
                 return 0;
         }
 
-        /* Recover orignal instruction code. */
+        /* Recover original instruction code. */
         *code = p->insn[i];
 
         /* Shift debug trap entries. */
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index d38ebd3b1201..ec78a5762e9e 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1755,8 +1755,8 @@ config SMP
           People using multiprocessor machines who say Y here should also say
           Y to "Enhanced Real Time Clock Support", below.
 
-          See also the <file:Documentation/smp.txt> and the SMP-HOWTO
-          available at <http://www.tldp.org/docs.html#howto>.
+          See also the SMP-HOWTO available at
+          <http://www.tldp.org/docs.html#howto>.
 
           If you don't know what to do here, say N.
 
diff --git a/arch/mips/au1000/mtx-1/board_setup.c b/arch/mips/au1000/mtx-1/board_setup.c
index abfc4bcddf7a..310d5dff89fc 100644
--- a/arch/mips/au1000/mtx-1/board_setup.c
+++ b/arch/mips/au1000/mtx-1/board_setup.c
@@ -99,7 +99,7 @@ mtx1_pci_idsel(unsigned int devsel, int assert)
 #endif
 
        if (assert && devsel != 0) {
-               // supress signal to cardbus
+               // suppress signal to cardbus
                au_writel( 0x00000002, SYS_OUTPUTCLR ); // set EXT_IO3 OFF
        }
        else {
diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c
index 9b34238d41c0..77db3473deab 100644
--- a/arch/mips/kernel/binfmt_elfn32.c
+++ b/arch/mips/kernel/binfmt_elfn32.c
@@ -98,7 +98,7 @@ static __inline__ void
 jiffies_to_compat_timeval(unsigned long jiffies, struct compat_timeval *value)
 {
         /*
-         * Convert jiffies to nanoseconds and seperate with
+         * Convert jiffies to nanoseconds and separate with
          * one divide.
          */
         u64 nsec = (u64)jiffies * TICK_NSEC;
diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c
index da41eac195ca..08f4cd781ee3 100644
--- a/arch/mips/kernel/binfmt_elfo32.c
+++ b/arch/mips/kernel/binfmt_elfo32.c
@@ -100,7 +100,7 @@ static inline void
 jiffies_to_compat_timeval(unsigned long jiffies, struct compat_timeval *value)
 {
         /*
-         * Convert jiffies to nanoseconds and seperate with
+         * Convert jiffies to nanoseconds and separate with
          * one divide.
          */
         u64 nsec = (u64)jiffies * TICK_NSEC;
diff --git a/arch/mips/kernel/kspd.c b/arch/mips/kernel/kspd.c
index f6704ab16306..998c4efcce88 100644
--- a/arch/mips/kernel/kspd.c
+++ b/arch/mips/kernel/kspd.c
@@ -221,7 +221,7 @@ void sp_work_handle_request(void)
                 }
         }
 
-        /* Run the syscall at the priviledge of the user who loaded the
+        /* Run the syscall at the privilege of the user who loaded the
            SP program */
 
         if (vpe_getuid(tclimit))
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index 269c252d956f..c032409cba9b 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -424,13 +424,13 @@ static void __init bootmem_init(void)
 #endif  /* CONFIG_SGI_IP27 */
 
 /*
- * arch_mem_init - initialize memory managment subsystem
+ * arch_mem_init - initialize memory management subsystem
  *
  *  o plat_mem_setup() detects the memory configuration and will record detected
  *    memory areas using add_memory_region.
  *
  * At this stage the memory configuration of the system is known to the
- * kernel but generic memory managment system is still entirely uninitialized.
+ * kernel but generic memory management system is still entirely uninitialized.
  *
  *  o bootmem_init()
  *  o sparse_init()
diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c
index 85f700e58131..b42e71c71119 100644
--- a/arch/mips/kernel/smtc.c
+++ b/arch/mips/kernel/smtc.c
@@ -65,7 +65,7 @@ asiduse smtc_live_asid[MAX_SMTC_TLBS][MAX_SMTC_ASIDS];
 static atomic_t ipi_timer_latch[NR_CPUS];
 
 /*
- * Number of InterProcessor Interupt (IPI) message buffers to allocate
+ * Number of InterProcessor Interrupt (IPI) message buffers to allocate
  */
 
 #define IPIBUF_PER_CPU 4
@@ -780,7 +780,7 @@ void smtc_send_ipi(int cpu, int type, unsigned int action)
         if (cpu_data[cpu].vpe_id != cpu_data[smp_processor_id()].vpe_id) {
                 if (type == SMTC_CLOCK_TICK)
                         atomic_inc(&ipi_timer_latch[cpu]);
-                /* If not on same VPE, enqueue and send cross-VPE interupt */
+                /* If not on same VPE, enqueue and send cross-VPE interrupt */
                 smtc_ipi_nq(&IPIQ[cpu], pipi);
                 LOCK_CORE_PRA();
                 settc(cpu_data[cpu].tc_id);
@@ -1063,7 +1063,7 @@ static void setup_cross_vpe_interrupts(unsigned int nvpe)
                 return;
 
         if (!cpu_has_vint)
-                panic("SMTC Kernel requires Vectored Interupt support");
+                panic("SMTC Kernel requires Vectored Interrupt support");
 
         set_vi_handler(MIPS_CPU_IPI_IRQ, ipi_irq_dispatch);
 
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c
index 02bd180f0e02..53ec05267a98 100644
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
@@ -1101,7 +1101,7 @@ static void __init setup_scache(void)
         /*
          * Do the probing thing on R4000SC and R4400SC processors.  Other
          * processors don't have a S-cache that would be relevant to the
-         * Linux memory managment.
+         * Linux memory management.
          */
         switch (c->cputype) {
         case CPU_R4000SC:
diff --git a/arch/mips/sgi-ip27/ip27-hubio.c b/arch/mips/sgi-ip27/ip27-hubio.c
index 524b371f9397..a1fa4abb3f6a 100644
--- a/arch/mips/sgi-ip27/ip27-hubio.c
+++ b/arch/mips/sgi-ip27/ip27-hubio.c
@@ -168,7 +168,7 @@ static void hub_set_piomode(nasid_t nasid)
 }
 
 /*
- * hub_pio_init  -  PIO-related hub initalization
+ * hub_pio_init  -  PIO-related hub initialization
  *
  * @hub:        hubinfo structure for our hub
  */
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 25c10fa69647..028d8a0fdbfd 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -206,9 +206,8 @@ config SMP
           singleprocessor machines. On a singleprocessor machine, the kernel
           will run faster if you say N here.
 
-          See also the <file:Documentation/smp.txt>,
-          <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO available
-          at <http://www.tldp.org/docs.html#howto>.
+          See also <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO
+          available at <http://www.tldp.org/docs.html#howto>.
 
           If you don't know what to do here, say N.
 
diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c
index 395bbce64993..e10d25d2d9c9 100644
--- a/arch/parisc/kernel/cache.c
+++ b/arch/parisc/kernel/cache.c
@@ -305,7 +305,7 @@ flush_user_cache_page_non_current(struct vm_area_struct *vma,
         /* save the current process space and pgd */
         unsigned long space = mfsp(3), pgd = mfctl(25);
 
-        /* we don't mind taking interrups since they may not
+        /* we don't mind taking interrupts since they may not
          * do anything with user space, but we can't
          * be preempted here */
         preempt_disable();
diff --git a/arch/parisc/kernel/hardware.c b/arch/parisc/kernel/hardware.c
index 04848b2b381c..84b9611a9228 100644
--- a/arch/parisc/kernel/hardware.c
+++ b/arch/parisc/kernel/hardware.c
@@ -1187,7 +1187,7 @@ static struct hp_hardware hp_hardware_list[] __devinitdata = {
         {HPHW_FIO, 0x005, 0x000A9, 0x00, "AllegroLow Core PCI USB KB"}, 
         {HPHW_FIO, 0x006, 0x000A9, 0x00, "AllegroHigh Core PCI SuperIO RS-232"}, 
         {HPHW_FIO, 0x006, 0x000A9, 0x00, "AllegroHigh Core PCI USB KB"}, 
-        {HPHW_FIO, 0x007, 0x000A9, 0x0, "Miscelaneous PCI Plug-in"}, 
+        {HPHW_FIO, 0x007, 0x000A9, 0x0, "Miscellaneous PCI Plug-in"},
         {HPHW_FIO, 0x00A, 0x000A9, 0x0, "Lego 360 Core PCI SuperIO RS-232"}, 
         {HPHW_FIO, 0x00A, 0x000A9, 0x0, "Lego 360 Core PCI USB KB"}, 
         {HPHW_FIO, 0x004, 0x00320, 0x0, "Metheus Frame Buffer"}, 
diff --git a/arch/parisc/kernel/signal.c b/arch/parisc/kernel/signal.c
index 2ce3806f02e1..58fccc96d003 100644
--- a/arch/parisc/kernel/signal.c
+++ b/arch/parisc/kernel/signal.c
@@ -333,7 +333,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         flush_user_icache_range((unsigned long) &frame->tramp[0],
                            (unsigned long) &frame->tramp[TRAMP_SIZE]);
 
-        /* TRAMP Words 0-4, Lenght 5 = SIGRESTARTBLOCK_TRAMP
+        /* TRAMP Words 0-4, Length 5 = SIGRESTARTBLOCK_TRAMP
          * TRAMP Words 5-9, Length 4 = SIGRETURN_TRAMP
          * So the SIGRETURN_TRAMP is at the end of SIGRESTARTBLOCK_TRAMP
          */
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 974f9c3e89d9..82cbffd03654 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -83,8 +83,8 @@ config SMP
           singleprocessor machines. On a singleprocessor machine, the kernel
           will run faster if you say N here.
 
-          See also the <file:Documentation/smp.txt> and the SMP-HOWTO
-          available at <http://www.tldp.org/docs.html#howto>.
+          See also the SMP-HOWTO available at
+          <http://www.tldp.org/docs.html#howto>.
 
           Even if you don't know what to do here, say Y.
 
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index bfbd54a22bde..1c3a90835c7e 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -673,9 +673,8 @@ config SMP
           People using multiprocessor machines who say Y here should also say
           Y to "Enhanced Real Time Clock Support", below.
 
-          See also the <file:Documentation/smp.txt>,
-          <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO available
-          at <http://www.tldp.org/docs.html#howto>.
+          See also <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO
+          available at <http://www.tldp.org/docs.html#howto>.
 
           If you don't know what to do here, say N.
 
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 51008a2ba5b4..99f8971716d2 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -48,9 +48,8 @@ config SMP
           Y to "Enhanced Real Time Clock Support", below. The "Advanced Power
           Management" code will be disabled if you say Y here.
 
-          See also the <file:Documentation/smp.txt>,
-          <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO available at
-          <http://www.tldp.org/docs.html#howto>.
+          See also <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO
+          available at <http://www.tldp.org/docs.html#howto>.
 
           If you don't know what to do here, say N.
 
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c
index 97aa50d1e4ae..ad0ede24ca1d 100644
--- a/arch/sparc/kernel/ioport.c
+++ b/arch/sparc/kernel/ioport.c
@@ -305,7 +305,7 @@ void *sbus_alloc_consistent(struct sbus_dev *sdev, long len, u32 *dma_addrp)
         struct resource *res;
         int order;
 
-        /* XXX why are some lenghts signed, others unsigned? */
+        /* XXX why are some lengths signed, others unsigned? */
         if (len <= 0) {
                 return NULL;
         }
@@ -393,7 +393,7 @@ void sbus_free_consistent(struct sbus_dev *sdev, long n, void *p, u32 ba)
  */
 dma_addr_t sbus_map_single(struct sbus_dev *sdev, void *va, size_t len, int direction)
 {
-        /* XXX why are some lenghts signed, others unsigned? */
+        /* XXX why are some lengths signed, others unsigned? */
         if (len <= 0) {
                 return 0;
         }
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index a7739b507b74..a8c6366f05a1 100644
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -168,9 +168,8 @@ config SMP
           Y to "Enhanced Real Time Clock Support", below. The "Advanced Power
           Management" code will be disabled if you say Y here.
 
-          See also the <file:Documentation/smp.txt>,
-          <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO available at
-          <http://www.tldp.org/docs.html#howto>.
+          See also <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO
+          available at <http://www.tldp.org/docs.html#howto>.
 
           If you don't know what to do here, say N.
 
diff --git a/arch/um/sys-x86_64/signal.c b/arch/um/sys-x86_64/signal.c
index 7457436b433a..14070181407b 100644
--- a/arch/um/sys-x86_64/signal.c
+++ b/arch/um/sys-x86_64/signal.c
@@ -112,7 +112,7 @@ static int copy_sc_to_user(struct sigcontext __user *to,
         err |= PUTREG(regs, RSI, to, si);
         err |= PUTREG(regs, RBP, to, bp);
         /*
-         * Must use orignal RSP, which is passed in, rather than what's in
+         * Must use original RSP, which is passed in, rather than what's in
          * the pt_regs, because that's already been updated to point at the
          * signal frame.
          */
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
           Y to "Enhanced Real Time Clock Support", below. The "Advanced Power
           Management" code will be disabled if you say Y here.
 
-          See also the <file:Documentation/smp.txt>,
-          <file:Documentation/i386/IO-APIC.txt>,
+          See also <file:Documentation/i386/IO-APIC.txt>,
           <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO available at
           <http://www.tldp.org/docs.html#howto>.
 
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 @@
 #include <linux/module.h>
 
 /**
- * find_next_bit - find the first set bit in a memory region
+ * find_next_bit - find the next set bit in a memory region
  * @addr: The address to base the search on
  * @offset: The bitnumber to start searching at
  * @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)
 }
 
 /**
- * find_next_zero_bit - find the first zero bit in a memory region
+ * find_next_zero_bit - find the next zero bit in a memory region
  * @addr: The address to base the search on
  * @offset: The bitnumber to start searching at
  * @size: The maximum size to search