Merge branch 'for-next' into for-linus

Conflicts:

	kernel/irq/chip.c

7 files changed, 7 insertions, 7 deletions

diff --git a/arch/mips/include/asm/mach-pnx833x/gpio.h b/arch/mips/include/asm/mach-pnx833x/gpio.h
index 8de0eb9c98a3..ed3a88da70f6 100644
--- a/arch/mips/include/asm/mach-pnx833x/gpio.h
+++ b/arch/mips/include/asm/mach-pnx833x/gpio.h
@@ -24,7 +24,7 @@
 
 /* BIG FAT WARNING: races danger!
    No protections exist here. Current users are only early init code,
-   when locking is not needed because no cuncurency yet exists there,
+   when locking is not needed because no concurrency yet exists there,
    and GPIO IRQ dispatcher, which does locking.
    However, if many uses will ever happen, proper locking will be needed
    - including locking between different uses
diff --git a/arch/mips/include/asm/sgi/ioc.h b/arch/mips/include/asm/sgi/ioc.h
index 343ed15f8dc4..57a971904cfe 100644
--- a/arch/mips/include/asm/sgi/ioc.h
+++ b/arch/mips/include/asm/sgi/ioc.h
@@ -164,7 +164,7 @@ struct sgioc_regs {
         u32 _unused5;
         u8 _write[3];
         volatile u8 write;
-#define SGIOC_WRITE_NTHRESH     0x01    /* use 4.5db threshhold */
+#define SGIOC_WRITE_NTHRESH     0x01    /* use 4.5db threshold */
 #define SGIOC_WRITE_TPSPEED     0x02    /* use 100ohm TP speed */
 #define SGIOC_WRITE_EPSEL       0x04    /* force cable mode: 1=AUI 0=TP */
 #define SGIOC_WRITE_EASEL       0x08    /* 1=autoselect 0=manual cable selection */
diff --git a/arch/mips/include/asm/sibyte/sb1250_mac.h b/arch/mips/include/asm/sibyte/sb1250_mac.h
index b6faf08ca81d..591b9061fd8e 100644
--- a/arch/mips/include/asm/sibyte/sb1250_mac.h
+++ b/arch/mips/include/asm/sibyte/sb1250_mac.h
@@ -212,7 +212,7 @@
 #define G_MAC_TXD_WEIGHT1(x)        _SB_GETVALUE(x, S_MAC_TXD_WEIGHT1, M_MAC_TXD_WEIGHT1)
 
 /*
- * MAC Fifo Threshhold registers (Table 9-14)
+ * MAC Fifo Threshold registers (Table 9-14)
  * Register: MAC_THRSH_CFG_0
  * Register: MAC_THRSH_CFG_1
  * Register: MAC_THRSH_CFG_2
diff --git a/arch/mips/include/asm/sn/sn0/hubio.h b/arch/mips/include/asm/sn/sn0/hubio.h
index d0c29d4de084..31c76c021bb6 100644
--- a/arch/mips/include/asm/sn/sn0/hubio.h
+++ b/arch/mips/include/asm/sn/sn0/hubio.h
@@ -825,7 +825,7 @@ typedef union iprb_u {
         struct {
             u64 rsvd1:  15,
                 error:  1,      /* Widget rcvd wr resp pkt w/ error */
-                ovflow: 5,      /* Over flow count. perf measurement */
+                ovflow: 5,      /* Overflow count. perf measurement */
                 fire_and_forget: 1, /* Launch Write without response */
                 mode:   2,      /* Widget operation Mode        */
                 rsvd2:  2,
diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c
index 24630fd8ef60..a38e3ee95515 100644
--- a/arch/mips/kernel/smtc.c
+++ b/arch/mips/kernel/smtc.c
@@ -1331,7 +1331,7 @@ void smtc_get_new_mmu_context(struct mm_struct *mm, unsigned long cpu)
                 if (!((asid += ASID_INC) & ASID_MASK) ) {
                         if (cpu_has_vtag_icache)
                                 flush_icache_all();
-                        /* Traverse all online CPUs (hack requires contigous range) */
+                        /* Traverse all online CPUs (hack requires contiguous range) */
                         for_each_online_cpu(i) {
                                 /*
                                  * We don't need to worry about our own CPU, nor those of
diff --git a/arch/mips/math-emu/dp_sub.c b/arch/mips/math-emu/dp_sub.c
index b30c5b1f1a2c..a2127d685a0d 100644
--- a/arch/mips/math-emu/dp_sub.c
+++ b/arch/mips/math-emu/dp_sub.c
@@ -110,7 +110,7 @@ ieee754dp ieee754dp_sub(ieee754dp x, ieee754dp y)
 
         case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_DNORM):
                 DPDNORMX;
-                /* FAAL THOROUGH */
+                /* FALL THROUGH */
 
         case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_DNORM):
                 /* normalize ym,ye */
diff --git a/arch/mips/txx9/generic/smsc_fdc37m81x.c b/arch/mips/txx9/generic/smsc_fdc37m81x.c
index a2b2d62d88e3..8ebc3848f3ac 100644
--- a/arch/mips/txx9/generic/smsc_fdc37m81x.c
+++ b/arch/mips/txx9/generic/smsc_fdc37m81x.c
@@ -117,7 +117,7 @@ unsigned long __init smsc_fdc37m81x_init(unsigned long port)
         if (chip_id == SMSC_FDC37M81X_CHIP_ID)
                 smsc_fdc37m81x_config_end();
         else {
-                printk(KERN_WARNING "%s: unknow chip id 0x%02x\n", __func__,
+                printk(KERN_WARNING "%s: unknown chip id 0x%02x\n", __func__,
                        chip_id);
                 g_smsc_fdc37m81x_base = 0;
         }