Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (28 commits)
  trivial: Update my email address
  trivial: NULL noise: drivers/mtd/tests/mtd_*test.c
  trivial: NULL noise: drivers/media/dvb/frontends/drx397xD_fw.h
  trivial: Fix misspelling of "Celsius".
  trivial: remove unused variable 'path' in alloc_file()
  trivial: fix a pdlfush -> pdflush typo in comment
  trivial: jbd header comment typo fix for JBD_PARANOID_IOFAIL
  trivial: wusb: Storage class should be before const qualifier
  trivial: drivers/char/bsr.c: Storage class should be before const qualifier
  trivial: h8300: Storage class should be before const qualifier
  trivial: fix where cgroup documentation is not correctly referred to
  trivial: Give the right path in Documentation example
  trivial: MTD: remove EOL from MODULE_DESCRIPTION
  trivial: Fix typo in bio_split()'s documentation
  trivial: PWM: fix of #endif comment
  trivial: fix typos/grammar errors in Kconfig texts
  trivial: Fix misspelling of firmware
  trivial: cgroups: documentation typo and spelling corrections
  trivial: Update contact info for Jochen Hein
  trivial: fix typo "resgister" -> "register"
  ...

49 files changed, 79 insertions, 77 deletions

diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index c11f9aeca70..1ba9d61ea69 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -367,7 +367,7 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
                 /*
                  * Treat freezing temperatures as invalid as well; some
                  * BIOSes return really low values and cause reboots at startup.
-                 * Below zero (Celcius) values clearly aren't right for sure..
+                 * Below zero (Celsius) values clearly aren't right for sure..
                  * ... so lets discard those as invalid.
                  */
                 if (ACPI_FAILURE(status) ||
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 0bcf2646467..9120717c070 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -86,7 +86,7 @@ config ATA_SFF
 
           For users with exclusively modern controllers like AHCI,
           Silicon Image 3124, or Marvell 6440, you may choose to
-          disable this uneeded SFF support.
+          disable this unneeded SFF support.
 
           If unsure, say Y.
 
diff --git a/drivers/base/sys.c b/drivers/base/sys.c
index 76ce75bad91..3236b434b96 100644
--- a/drivers/base/sys.c
+++ b/drivers/base/sys.c
@@ -300,7 +300,7 @@ void sysdev_unregister(struct sys_device *sysdev)
  *      and the class driver.
  *
  *      Note: The list is iterated in reverse order, so that we shut down
- *      child devices before we shut down thier parents. The list ordering
+ *      child devices before we shut down their parents. The list ordering
  *      is guaranteed by virtue of the fact that child devices are registered
  *      after their parents.
  */
diff --git a/drivers/char/bsr.c b/drivers/char/bsr.c
index f6094ae0ef3..140ea10ecb8 100644
--- a/drivers/char/bsr.c
+++ b/drivers/char/bsr.c
@@ -140,7 +140,7 @@ static int bsr_open(struct inode * inode, struct file * filp)
         return 0;
 }
 
-const static struct file_operations bsr_fops = {
+static const struct file_operations bsr_fops = {
         .owner = THIS_MODULE,
         .mmap  = bsr_mmap,
         .open  = bsr_open,
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 3d2565441b3..edb02530e46 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -42,9 +42,9 @@ config DEBUG_GPIO
         depends on DEBUG_KERNEL
         help
           Say Y here to add some extra checks and diagnostics to GPIO calls.
-          The checks help ensure that GPIOs have been properly initialized
-          before they are used and that sleeping calls aren not made from
-          nonsleeping contexts.  They can make bitbanged serial protocols
+          These checks help ensure that GPIOs have been properly initialized
+          before they are used, and that sleeping calls are not made from
+          non-sleeping contexts.  They can make bitbanged serial protocols
           slower.  The diagnostics help catch the type of setup errors
           that are most common when setting up new platforms or boards.
 
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index e85c8fe9ffc..504cfaa6160 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -243,7 +243,7 @@ config GREENASIA_FF
         select INPUT_FF_MEMLESS
         ---help---
         Say Y here if you have a GreenAsia (Product ID 0x12) based game controller
-        (like MANTA Warior MM816 and SpeedLink Strike2 SL-6635) or adapter
+        (like MANTA Warrior MM816 and SpeedLink Strike2 SL-6635) or adapter
         and want to enable force feedback support for it.
 
 config HID_TOPSEED
diff --git a/drivers/hwmon/f75375s.c b/drivers/hwmon/f75375s.c
index 18a1ba88816..e2107e533ed 100644
--- a/drivers/hwmon/f75375s.c
+++ b/drivers/hwmon/f75375s.c
@@ -1,7 +1,7 @@
 /*
  * f75375s.c - driver for the Fintek F75375/SP and F75373
  *             hardware monitoring features
- * Copyright (C) 2006-2007  Riku Voipio <riku.voipio@movial.fi>
+ * Copyright (C) 2006-2007  Riku Voipio
  *
  * Datasheets available at:
  *
@@ -721,7 +721,7 @@ static void __exit sensors_f75375_exit(void)
         i2c_del_driver(&f75375_driver);
 }
 
-MODULE_AUTHOR("Riku Voipio <riku.voipio@movial.fi>");
+MODULE_AUTHOR("Riku Voipio");
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("F75373/F75375 hardware monitoring driver");
 
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index 5f9d860925a..cd50c00ab20 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -143,7 +143,7 @@ config INPUT_APMPOWER
         ---help---
           Say Y here if you want suspend key events to trigger a user
           requested suspend through APM. This is useful on embedded
-          systems where such behviour is desired without userspace
+          systems where such behaviour is desired without userspace
           interaction. If unsure, say N.
 
           To compile this driver as a module, choose M here: the
diff --git a/drivers/input/mouse/gpio_mouse.c b/drivers/input/mouse/gpio_mouse.c
index 0db8d16c5ed..5e5eb88d8d1 100644
--- a/drivers/input/mouse/gpio_mouse.c
+++ b/drivers/input/mouse/gpio_mouse.c
@@ -18,7 +18,7 @@
 
 /*
  * Timer function which is run every scan_ms ms when the device is opened.
- * The dev input varaible is set to the the input_dev pointer.
+ * The dev input variable is set to the the input_dev pointer.
  */
 static void gpio_mouse_scan(struct input_polled_dev *dev)
 {
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index 7c27c8b9b6d..056ac77e2cf 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -295,7 +295,7 @@ name ## _show(struct device *dev, struct device_attribute *attr, char *buf) \
 static DEVICE_ATTR(name, S_IRUGO, name ## _show, NULL);
 
 
-/* Sysfs conventions report temperatures in millidegrees Celcius.
+/* Sysfs conventions report temperatures in millidegrees Celsius.
  * ADS7846 could use the low-accuracy two-sample scheme, but can't do the high
  * accuracy scheme without calibration data.  For now we won't try either;
  * userspace sees raw sensor values, and must scale/calibrate appropriately.
diff --git a/drivers/isdn/mISDN/Kconfig b/drivers/isdn/mISDN/Kconfig
index 4938355c407..1747a02a019 100644
--- a/drivers/isdn/mISDN/Kconfig
+++ b/drivers/isdn/mISDN/Kconfig
@@ -14,13 +14,15 @@ config MISDN_DSP
         depends on MISDN
         help
           Enable support for digital audio processing capability.
+
           This module may be used for special applications that require
-          cross connecting of bchannels, conferencing, dtmf decoding
+          cross connecting of bchannels, conferencing, dtmf decoding,
           echo cancelation, tone generation, and Blowfish encryption and
-          decryption.
-          It may use hardware features if available.
+          decryption. It may use hardware features if available.
+
           E.g. it is required for PBX4Linux. Go to http://isdn.eversberg.eu
-          and get more informations about this module and it's usage.
+          and get more information about this module and its usage.
+
           If unsure, say 'N'.
 
 config MISDN_L1OIP
diff --git a/drivers/isdn/mISDN/l1oip_codec.c b/drivers/isdn/mISDN/l1oip_codec.c
index 2ec4b28d9ed..e4ecba3d48d 100644
--- a/drivers/isdn/mISDN/l1oip_codec.c
+++ b/drivers/isdn/mISDN/l1oip_codec.c
@@ -331,7 +331,7 @@ l1oip_4bit_alloc(int ulaw)
         /* alloc conversion tables */
         table_com = vmalloc(65536);
         table_dec = vmalloc(512);
-        if (!table_com | !table_dec) {
+        if (!table_com || !table_dec) {
                 l1oip_4bit_free();
                 return -ENOMEM;
         }
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index 556aeca0d86..d9db17624f1 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -100,7 +100,7 @@ config LEDS_HP6XX
         tristate "LED Support for the HP Jornada 6xx"
         depends on LEDS_CLASS && SH_HP6XX
         help
-          This option enables led support for the handheld
+          This option enables LED support for the handheld
           HP Jornada 620/660/680/690.
 
 config LEDS_PCA9532
@@ -108,7 +108,7 @@ config LEDS_PCA9532
         depends on LEDS_CLASS && I2C && INPUT && EXPERIMENTAL
         help
           This option enables support for NXP pca9532
-          led controller. It is generally only usefull
+          LED controller. It is generally only useful
           as a platform driver
 
 config LEDS_GPIO
@@ -144,7 +144,7 @@ config LEDS_CLEVO_MAIL
                 Positivo Mobile (Clevo M5x0V)
 
           If your model is not listed here you can try the "nodetect"
-          module paramter.
+          module parameter.
 
           To compile this driver as a module, choose M here: the
           module will be called leds-clevo-mail.
diff --git a/drivers/leds/leds-pca9532.c b/drivers/leds/leds-pca9532.c
index 76ec7498e2d..bd3b431c971 100644
--- a/drivers/leds/leds-pca9532.c
+++ b/drivers/leds/leds-pca9532.c
@@ -1,7 +1,7 @@
 /*
  * pca9532.c - 16-bit Led dimmer
  *
- * Copyright (C) 2008 Riku Voipio <riku.voipio@movial.fi>
+ * Copyright (C) 2008 Riku Voipio
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -367,7 +367,7 @@ static void __exit pca9532_exit(void)
         i2c_del_driver(&pca9532_driver);
 }
 
-MODULE_AUTHOR("Riku Voipio <riku.voipio@movial.fi>");
+MODULE_AUTHOR("Riku Voipio");
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("PCA 9532 LED dimmer");
 
diff --git a/drivers/media/common/tuners/Kconfig b/drivers/media/common/tuners/Kconfig
index 52c3f65b12d..607d319ce8e 100644
--- a/drivers/media/common/tuners/Kconfig
+++ b/drivers/media/common/tuners/Kconfig
@@ -148,7 +148,7 @@ config MEDIA_TUNER_XC5000
         default m if MEDIA_TUNER_CUSTOMISE
         help
           A driver for the silicon tuner XC5000 from Xceive.
-          This device is only used inside a SiP called togther with a
+          This device is only used inside a SiP called together with a
           demodulator for now.
 
 config MEDIA_TUNER_MXL5005S
diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig
index a206cee23f7..a486a7f81fa 100644
--- a/drivers/media/dvb/frontends/Kconfig
+++ b/drivers/media/dvb/frontends/Kconfig
@@ -479,7 +479,7 @@ config DVB_TUNER_DIB0070
         default m if DVB_FE_CUSTOMISE
         help
           A driver for the silicon baseband tuner DiB0070 from DiBcom.
-          This device is only used inside a SiP called togther with a
+          This device is only used inside a SiP called together with a
           demodulator for now.
 
 comment "SEC control devices for DVB-S"
diff --git a/drivers/media/dvb/frontends/drx397xD.c b/drivers/media/dvb/frontends/drx397xD.c
index 1e81e713df6..172f1f928f0 100644
--- a/drivers/media/dvb/frontends/drx397xD.c
+++ b/drivers/media/dvb/frontends/drx397xD.c
@@ -74,7 +74,7 @@ static struct {
 } fw[] = {
 #define _FW_ENTRY(a, b, c)      {                                       \
                         .name   = a,                                    \
-                        .file   = 0,                                    \
+                        .file   = NULL,                                 \
                         .lock   = __RW_LOCK_UNLOCKED(fw[c].lock),       \
                         .refcnt = 0,                                    \
                         .data   = { }           }
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 06a2b0f7737..75f35dbb11d 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -88,7 +88,7 @@ config MENELAUS
         help
           If you say yes here you get support for the Texas Instruments
           TWL92330/Menelaus Power Management chip. This include voltage
-          regulators, Dual slot memory card tranceivers, real-time clock
+          regulators, Dual slot memory card transceivers, real-time clock
           and other features that are often used in portable devices like
           cell phones and PDAs.
 
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 0b92b2f6ea6..6d1ac180f6e 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -18,8 +18,8 @@ config ATMEL_PWM
         depends on AVR32 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91CAP9
         help
           This option enables device driver support for the PWM channels
-          on certain Atmel prcoessors.  Pulse Width Modulation is used for
-          purposes including software controlled power-efficent backlights
+          on certain Atmel processors.  Pulse Width Modulation is used for
+          purposes including software controlled power-efficient backlights
           on LCD displays, motor control, and waveform generation.
 
 config ATMEL_TCLIB
@@ -142,7 +142,7 @@ config ATMEL_SSC
         tristate "Device driver for Atmel SSC peripheral"
         depends on AVR32 || ARCH_AT91
         ---help---
-          This option enables device driver support for Atmel Syncronized
+          This option enables device driver support for Atmel Synchronized
           Serial Communication peripheral (SSC).
 
           The SSC peripheral supports a wide variety of serial frame based
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 99d4b28d52e..6fbb246c40b 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -177,7 +177,7 @@ config MMC_SPI
         select CRC7
         select CRC_ITU_T
         help
-          Some systems accss MMC/SD/SDIO cards using a SPI controller
+          Some systems access MMC/SD/SDIO cards using a SPI controller
           instead of using a "native" MMC/SD/SDIO controller.  This has a
           disadvantage of being relatively high overhead, but a compensating
           advantage of working on many systems without dedicated MMC/SD/SDIO
diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c
index e4226e02d63..e51c1ed7ac1 100644
--- a/drivers/mtd/nand/diskonchip.c
+++ b/drivers/mtd/nand/diskonchip.c
@@ -1773,4 +1773,4 @@ module_exit(cleanup_nanddoc);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("David Woodhouse <dwmw2@infradead.org>");
-MODULE_DESCRIPTION("M-Systems DiskOnChip 2000, Millennium and Millennium Plus device driver\n");
+MODULE_DESCRIPTION("M-Systems DiskOnChip 2000, Millennium and Millennium Plus device driver");
diff --git a/drivers/mtd/tests/mtd_oobtest.c b/drivers/mtd/tests/mtd_oobtest.c
index afbc3f8126d..a18e8d2f255 100644
--- a/drivers/mtd/tests/mtd_oobtest.c
+++ b/drivers/mtd/tests/mtd_oobtest.c
@@ -136,7 +136,7 @@ static int write_eraseblock(int ebnum)
                 ops.ooblen    = use_len;
                 ops.oobretlen = 0;
                 ops.ooboffs   = use_offset;
-                ops.datbuf    = 0;
+                ops.datbuf    = NULL;
                 ops.oobbuf    = writebuf;
                 err = mtd->write_oob(mtd, addr, &ops);
                 if (err || ops.oobretlen != use_len) {
@@ -189,7 +189,7 @@ static int verify_eraseblock(int ebnum)
                 ops.ooblen    = use_len;
                 ops.oobretlen = 0;
                 ops.ooboffs   = use_offset;
-                ops.datbuf    = 0;
+                ops.datbuf    = NULL;
                 ops.oobbuf    = readbuf;
                 err = mtd->read_oob(mtd, addr, &ops);
                 if (err || ops.oobretlen != use_len) {
@@ -216,7 +216,7 @@ static int verify_eraseblock(int ebnum)
                         ops.ooblen    = mtd->ecclayout->oobavail;
                         ops.oobretlen = 0;
                         ops.ooboffs   = 0;
-                        ops.datbuf    = 0;
+                        ops.datbuf    = NULL;
                         ops.oobbuf    = readbuf;
                         err = mtd->read_oob(mtd, addr, &ops);
                         if (err || ops.oobretlen != mtd->ecclayout->oobavail) {
@@ -281,7 +281,7 @@ static int verify_eraseblock_in_one_go(int ebnum)
         ops.ooblen    = len;
         ops.oobretlen = 0;
         ops.ooboffs   = 0;
-        ops.datbuf    = 0;
+        ops.datbuf    = NULL;
         ops.oobbuf    = readbuf;
         err = mtd->read_oob(mtd, addr, &ops);
         if (err || ops.oobretlen != len) {
@@ -522,7 +522,7 @@ static int __init mtd_oobtest_init(void)
         ops.ooblen    = 1;
         ops.oobretlen = 0;
         ops.ooboffs   = mtd->ecclayout->oobavail;
-        ops.datbuf    = 0;
+        ops.datbuf    = NULL;
         ops.oobbuf    = writebuf;
         printk(PRINT_PREF "attempting to start write past end of OOB\n");
         printk(PRINT_PREF "an error is expected...\n");
@@ -542,7 +542,7 @@ static int __init mtd_oobtest_init(void)
         ops.ooblen    = 1;
         ops.oobretlen = 0;
         ops.ooboffs   = mtd->ecclayout->oobavail;
-        ops.datbuf    = 0;
+        ops.datbuf    = NULL;
         ops.oobbuf    = readbuf;
         printk(PRINT_PREF "attempting to start read past end of OOB\n");
         printk(PRINT_PREF "an error is expected...\n");
@@ -566,7 +566,7 @@ static int __init mtd_oobtest_init(void)
                 ops.ooblen    = mtd->ecclayout->oobavail + 1;
                 ops.oobretlen = 0;
                 ops.ooboffs   = 0;
-                ops.datbuf    = 0;
+                ops.datbuf    = NULL;
                 ops.oobbuf    = writebuf;
                 printk(PRINT_PREF "attempting to write past end of device\n");
                 printk(PRINT_PREF "an error is expected...\n");
@@ -586,7 +586,7 @@ static int __init mtd_oobtest_init(void)
                 ops.ooblen    = mtd->ecclayout->oobavail + 1;
                 ops.oobretlen = 0;
                 ops.ooboffs   = 0;
-                ops.datbuf    = 0;
+                ops.datbuf    = NULL;
                 ops.oobbuf    = readbuf;
                 printk(PRINT_PREF "attempting to read past end of device\n");
                 printk(PRINT_PREF "an error is expected...\n");
@@ -610,7 +610,7 @@ static int __init mtd_oobtest_init(void)
                 ops.ooblen    = mtd->ecclayout->oobavail;
                 ops.oobretlen = 0;
                 ops.ooboffs   = 1;
-                ops.datbuf    = 0;
+                ops.datbuf    = NULL;
                 ops.oobbuf    = writebuf;
                 printk(PRINT_PREF "attempting to write past end of device\n");
                 printk(PRINT_PREF "an error is expected...\n");
@@ -630,7 +630,7 @@ static int __init mtd_oobtest_init(void)
                 ops.ooblen    = mtd->ecclayout->oobavail;
                 ops.oobretlen = 0;
                 ops.ooboffs   = 1;
-                ops.datbuf    = 0;
+                ops.datbuf    = NULL;
                 ops.oobbuf    = readbuf;
                 printk(PRINT_PREF "attempting to read past end of device\n");
                 printk(PRINT_PREF "an error is expected...\n");
@@ -670,7 +670,7 @@ static int __init mtd_oobtest_init(void)
                         ops.ooblen    = sz;
                         ops.oobretlen = 0;
                         ops.ooboffs   = 0;
-                        ops.datbuf    = 0;
+                        ops.datbuf    = NULL;
                         ops.oobbuf    = writebuf;
                         err = mtd->write_oob(mtd, addr, &ops);
                         if (err)
@@ -698,7 +698,7 @@ static int __init mtd_oobtest_init(void)
                 ops.ooblen    = mtd->ecclayout->oobavail * 2;
                 ops.oobretlen = 0;
                 ops.ooboffs   = 0;
-                ops.datbuf    = 0;
+                ops.datbuf    = NULL;
                 ops.oobbuf    = readbuf;
                 err = mtd->read_oob(mtd, addr, &ops);
                 if (err)
diff --git a/drivers/mtd/tests/mtd_readtest.c b/drivers/mtd/tests/mtd_readtest.c
index 645e77fdc63..79fc4530987 100644
--- a/drivers/mtd/tests/mtd_readtest.c
+++ b/drivers/mtd/tests/mtd_readtest.c
@@ -71,7 +71,7 @@ static int read_eraseblock_by_page(int ebnum)
                         ops.ooblen    = mtd->oobsize;
                         ops.oobretlen = 0;
                         ops.ooboffs   = 0;
-                        ops.datbuf    = 0;
+                        ops.datbuf    = NULL;
                         ops.oobbuf    = oobbuf;
                         ret = mtd->read_oob(mtd, addr, &ops);
                         if (ret || ops.oobretlen != mtd->oobsize) {
diff --git a/drivers/net/sb1250-mac.c b/drivers/net/sb1250-mac.c
index 88dd2e09832..ce7551e17ba 100644
--- a/drivers/net/sb1250-mac.c
+++ b/drivers/net/sb1250-mac.c
@@ -2299,7 +2299,7 @@ static int sbmac_init(struct platform_device *pldev, long long base)
         eaddr = sc->sbm_hwaddr;
 
         /*
-         * Read the ethernet address.  The firwmare left this programmed
+         * Read the ethernet address.  The firmware left this programmed
          * for us in the ethernet address register for each mac.
          */
 
diff --git a/drivers/net/skfp/h/hwmtm.h b/drivers/net/skfp/h/hwmtm.h
index 1a606d4bfe5..e1a7e5f683d 100644
--- a/drivers/net/skfp/h/hwmtm.h
+++ b/drivers/net/skfp/h/hwmtm.h
@@ -145,7 +145,7 @@ struct hw_modul {
         int     leave_isr ;             /* leave fddi_isr immedeately if set */
         int     isr_flag ;              /* set, when HWM is entered from isr */
         /*
-         * varaibles for the current transmit frame
+         * variables for the current transmit frame
          */
         struct s_smt_tx_queue *tx_p ;   /* pointer to the transmit queue */
         u_long  tx_descr ;              /* tx descriptor for FORMAC+ */
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 1205c2a2265..437683aab32 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -11225,7 +11225,7 @@ static int __devinit tg3_phy_probe(struct tg3 *tp)
                 return tg3_phy_init(tp);
 
         /* Reading the PHY ID register can conflict with ASF
-         * firwmare access to the PHY hardware.
+         * firmware access to the PHY hardware.
          */
         err = 0;
         if ((tp->tg3_flags & TG3_FLAG_ENABLE_ASF) ||
diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c
index 00945f7c1e9..25c9ef6a181 100644
--- a/drivers/net/wan/farsync.c
+++ b/drivers/net/wan/farsync.c
@@ -69,7 +69,7 @@ MODULE_LICENSE("GPL");
 #endif
 
 /*
- * Modules parameters and associated varaibles
+ * Modules parameters and associated variables
  */
 static int fst_txq_low = FST_LOW_WATER_MARK;
 static int fst_txq_high = FST_HIGH_WATER_MARK;
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
index 115b7048750..f4e963ba768 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
@@ -2362,7 +2362,7 @@ static void ipw2100_corruption_detected(struct ipw2100_priv *priv, int i)
                        i * sizeof(struct ipw2100_status));
 
 #ifdef IPW2100_DEBUG_C3
-        /* Halt the fimrware so we can get a good image */
+        /* Halt the firmware so we can get a good image */
         write_register(priv->net_dev, IPW_REG_RESET_REG,
                        IPW_AUX_HOST_RESET_REG_STOP_MASTER);
         j = 5;
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index 4a92af1d787..e17a4593e1f 100644
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -8844,7 +8844,7 @@ static int ipw_wx_set_mode(struct net_device *dev,
 #endif                          /* CONFIG_IPW2200_MONITOR */
 
         /* Free the existing firmware and reset the fw_loaded
-         * flag so ipw_load() will bring in the new firmawre */
+         * flag so ipw_load() will bring in the new firmware */
         free_firmware();
 
         priv->ieee->iw_mode = wrqu->mode;
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 663dc83be50..3889158b359 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -1337,7 +1337,7 @@ static int iwl_read_ucode(struct iwl_priv *priv)
 
         /* api_ver should match the api version forming part of the
          * firmware filename ... but we don't check for that and only rely
-         * on the API version read from firware header from here on forward */
+         * on the API version read from firmware header from here on forward */
 
         if (api_ver < api_min || api_ver > api_max) {
                 IWL_ERR(priv, "Driver unable to support your firmware API. "
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index a71b08ca7c7..9d5f97dd7c7 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -2562,7 +2562,7 @@ static int iwl3945_read_ucode(struct iwl_priv *priv)
 
         /* api_ver should match the api version forming part of the
          * firmware filename ... but we don't check for that and only rely
-         * on the API version read from firware header from here on forward */
+         * on the API version read from firmware header from here on forward */
 
         if (api_ver < api_min || api_ver > api_max) {
                 IWL_ERR(priv, "Driver unable to support your firmware API. "
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index 639dd02d3d3..8c3605cdc64 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -1649,7 +1649,7 @@ static struct cmd_ctrl_node *lbs_get_cmd_ctrl_node(struct lbs_private *priv)
 
 /**
  *  @brief This function executes next command in command
- *  pending queue. It will put fimware back to PS mode
+ *  pending queue. It will put firmware back to PS mode
  *  if applicable.
  *
  *  @param priv     A pointer to struct lbs_private structure
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index fe7ac2cea7c..445fb6f7ea3 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -593,7 +593,7 @@ EXPORT_SYMBOL_GPL(__pci_complete_power_transition);
  * @dev: PCI device to handle.
  * @state: PCI power state (D0, D1, D2, D3hot) to put the device into.
  *
- * Transition a device to a new power state, using the platform formware and/or
+ * Transition a device to a new power state, using the platform firmware and/or
  * the device's PCI PM registers.
  *
  * RETURN VALUE:
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 3dad27a385d..d99f1cd435a 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -5811,7 +5811,7 @@ static struct ibm_struct volume_driver_data = {
  *      ThinkPads from this same time period (and earlier) probably lack the
  *      tachometer as well.
  *
- *      Unfortunately a lot of ThinkPads with new-style ECs but whose firwmare
+ *      Unfortunately a lot of ThinkPads with new-style ECs but whose firmware
  *      was never fixed by IBM to report the EC firmware version string
  *      probably support the tachometer (like the early X models), so
  *      detecting it is quite hard.  We need more data to know for sure.
diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
index 0c056fcc01c..62bb98124e2 100644
--- a/drivers/power/bq27x00_battery.c
+++ b/drivers/power/bq27x00_battery.c
@@ -83,7 +83,7 @@ static int bq27x00_read(u8 reg, int *rt_value, int b_single,
 }
 
 /*
- * Return the battery temperature in Celcius degrees
+ * Return the battery temperature in Celsius degrees
  * Or < 0 if something fails.
  */
 static int bq27x00_battery_temperature(struct bq27x00_device_info *di)
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index e2f44e6c0bc..20297c521e5 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -1380,7 +1380,7 @@ config SCSI_LPFC_DEBUG_FS
         bool "Emulex LightPulse Fibre Channel debugfs Support"
         depends on SCSI_LPFC && DEBUG_FS
         help
-          This makes debugging infomation from the lpfc driver
+          This makes debugging information from the lpfc driver
           available via the debugfs filesystem.
 
 config SCSI_SIM710
@@ -1388,7 +1388,7 @@ config SCSI_SIM710
         depends on (EISA || MCA) && SCSI
         select SCSI_SPI_ATTRS
         ---help---
-          This driver for NCR53c710 based SCSI host adapters.
+          This driver is for NCR53c710 based SCSI host adapters.
 
           It currently supports Compaq EISA cards and NCR MCA cards
 
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 9be11b0963f..aa9d3a4c2d5 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -1374,7 +1374,7 @@ config SERIAL_BFIN_SPORT
         depends on BLACKFIN && EXPERIMENTAL
         select SERIAL_CORE
         help
-          Enble support SPORT emulate UART on Blackfin series.
+          Enable SPORT emulate UART on Blackfin series.
 
           To compile this driver as a module, choose M here: the
           module will be called bfin_sport_uart.
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 211af86a6c5..92981c2383e 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -4,7 +4,7 @@ menuconfig STAGING
         ---help---
           This option allows you to select a number of drivers that are
           not of the "normal" Linux kernel quality level.  These drivers
-          are placed here in order to get a wider audience for use of
+          are placed here in order to get a wider audience to make use of
           them.  Please note that these drivers are under heavy
           development, may or may not work, and may contain userspace
           interfaces that most likely will be changed in the near
@@ -12,7 +12,7 @@ menuconfig STAGING
 
           Using any of these drivers will taint your kernel which might
           affect support options from both the community, and various
-          commercial support orginizations.
+          commercial support organizations.
 
           If you wish to work on these drivers, to help improve them, or
           to report problems you have with them, please see the
diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig
index b47ca1e7e38..83a93a5c639 100644
--- a/drivers/staging/comedi/Kconfig
+++ b/drivers/staging/comedi/Kconfig
@@ -1,9 +1,9 @@
 config COMEDI
-        tristate "Data Acquision support (comedi)"
+        tristate "Data acquisition support (comedi)"
         default N
         depends on m
         ---help---
-          Enable support a wide range of data acquision devices
+          Enable support a wide range of data acquisition devices
           for Linux.
 
 config COMEDI_RT
diff --git a/drivers/staging/go7007/Kconfig b/drivers/staging/go7007/Kconfig
index f2cf7f66ae0..ca6ade6c4b4 100644
--- a/drivers/staging/go7007/Kconfig
+++ b/drivers/staging/go7007/Kconfig
@@ -10,7 +10,7 @@ config VIDEO_GO7007
         select CRC32
         default N
         ---help---
-          This is a video4linux driver for some wierd device...
+          This is a video4linux driver for some weird device...
 
           To compile this driver as a module, choose M here: the
           module will be called go7007
@@ -20,7 +20,7 @@ config VIDEO_GO7007_USB
         depends on VIDEO_GO7007 && USB
         default N
         ---help---
-          This is a video4linux driver for some wierd device...
+          This is a video4linux driver for some weird device...
 
           To compile this driver as a module, choose M here: the
           module will be called go7007-usb
diff --git a/drivers/staging/otus/hal/hpmain.c b/drivers/staging/otus/hal/hpmain.c
index 2e65c466aae..dab27832693 100644
--- a/drivers/staging/otus/hal/hpmain.c
+++ b/drivers/staging/otus/hal/hpmain.c
@@ -152,7 +152,7 @@ u16_t zfHpInit(zdev_t* dev, u32_t frequency)
     else
     {
     #ifndef ZM_OTUS_LINUX_PHASE_2
-        /* donwload the normal frimware */
+        /* download the normal firmware */
         if ((ret = zfFirmwareDownload(dev, (u32_t*)zcFwImage,
                 (u32_t)zcFwImageSize, ZM_FIRMWARE_WLAN_ADDR)) != ZM_SUCCESS)
         {
diff --git a/drivers/staging/panel/Kconfig b/drivers/staging/panel/Kconfig
index c4b30f2a549..3abe7c9d558 100644
--- a/drivers/staging/panel/Kconfig
+++ b/drivers/staging/panel/Kconfig
@@ -110,7 +110,7 @@ config PANEL_LCD_BWIDTH
         ---help---
           Most LCDs use a standard controller which supports hardware lines of 40
           characters, although sometimes only 16, 20 or 24 of them are really wired
-          to the terminal. This results in some non-visible but adressable characters,
+          to the terminal. This results in some non-visible but addressable characters,
           and is the case for most parallel LCDs. Other LCDs, and some serial ones,
           however, use the same line width internally as what is visible. The KS0074
           for example, uses 16 characters per line for 16 visible characters per line.
diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c
index b6483dd98ac..9cf9ff69e3e 100644
--- a/drivers/usb/atm/ueagle-atm.c
+++ b/drivers/usb/atm/ueagle-atm.c
@@ -626,7 +626,7 @@ static void uea_upload_pre_firmware(const struct firmware *fw_entry, void *conte
                 goto err_fw_corrupted;
 
         /*
-         * Start to upload formware : send reset
+         * Start to upload firmware : send reset
          */
         value = 1;
         ret = uea_send_modem_cmd(usb, F8051_USBCS, sizeof(value), &value);
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 770b3eaa918..080bb1e4b84 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -392,7 +392,7 @@ config USB_GADGET_FSL_QE
            controllers having QE or CPM2, given minor tweaks.
 
            Set CONFIG_USB_GADGET to "m" to build this driver as a
-           dynmically linked module called "fsl_qe_udc".
+           dynamically linked module called "fsl_qe_udc".
 
 config USB_FSL_QE
         tristate
diff --git a/drivers/usb/serial/ChangeLog.history b/drivers/usb/serial/ChangeLog.history
index c1b279939bb..f13fd488ebe 100644
--- a/drivers/usb/serial/ChangeLog.history
+++ b/drivers/usb/serial/ChangeLog.history
@@ -715,7 +715,7 @@ io_edgeport.c Change Log comments:
 
  0.2 (01/30/2000) greg kroah-hartman
         Milestone 1 release.
-        Device is found by USB subsystem, enumerated, fimware is downloaded
+        Device is found by USB subsystem, enumerated, firmware is downloaded
         and the descriptors are printed to the debug log, config is set, and
         green light starts to blink. Open port works, and data can be sent
         and received at the default settings of the UART. Loopback connector
diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index a65f9196b0a..c480ea4c19f 100644
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -518,8 +518,8 @@ config USB_SERIAL_SIERRAWIRELESS
         help
           Say M here if you want to use Sierra Wireless devices.
 
-          Many deviecs have a feature known as TRU-Install, for those devices
-          to work properly the USB Storage Sierra feature must be enabled.
+          Many devices have a feature known as TRU-Install. For those devices
+          to work properly, the USB Storage Sierra feature must be enabled.
 
           To compile this driver as a module, choose M here: the
           module will be called sierra.
diff --git a/drivers/usb/wusbcore/security.c b/drivers/usb/wusbcore/security.c
index 8118db7f1d8..b2f149fedcc 100644
--- a/drivers/usb/wusbcore/security.c
+++ b/drivers/usb/wusbcore/security.c
@@ -562,7 +562,7 @@ void wusbhc_gtk_rekey(struct wusbhc *wusbhc)
                 struct wusb_dev *wusb_dev;
 
                 wusb_dev = wusbhc->port[p].wusb_dev;
-                if (!wusb_dev || !wusb_dev->usb_dev | !wusb_dev->usb_dev->authenticated)
+                if (!wusb_dev || !wusb_dev->usb_dev || !wusb_dev->usb_dev->authenticated)
                         continue;
 
                 usb_fill_control_urb(wusb_dev->set_gtk_urb, wusb_dev->usb_dev,
diff --git a/drivers/uwb/Kconfig b/drivers/uwb/Kconfig
index ca783127af3..bac8e7a6f17 100644
--- a/drivers/uwb/Kconfig
+++ b/drivers/uwb/Kconfig
@@ -48,10 +48,10 @@ config UWB_WHCI
         help
           This driver enables the radio controller for WHCI cards.
 
-          WHCI is an specification developed by Intel
+          WHCI is a specification developed by Intel
           (http://www.intel.com/technology/comms/wusb/whci.htm) much
           in the spirit of USB's EHCI, but for UWB and Wireless USB
-          radio/host controllers connected via memmory mapping (eg:
+          radio/host controllers connected via memory mapping (eg:
           PCI). Most of these cards come also with a Wireless USB host
           controller.
 
diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
index 526187c8a12..8ac9cddac57 100644
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@ -37,7 +37,7 @@ config XEN_COMPAT_XENFS
          The old xenstore userspace tools expect to find "xenbus"
          under /proc/xen, but "xenbus" is now found at the root of the
          xenfs filesystem.  Selecting this causes the kernel to create
-         the compatibilty mount point /proc/xen if it is running on
+         the compatibility mount point /proc/xen if it is running on
          a xen platform.
          If in doubt, say yes.