Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

17 files changed, 25 insertions, 25 deletions

diff --git a/drivers/cdrom/cm206.c b/drivers/cdrom/cm206.c
index 01f035173328..ce127f7ec0f6 100644
--- a/drivers/cdrom/cm206.c
+++ b/drivers/cdrom/cm206.c
@@ -32,7 +32,7 @@ History:
  18 mrt 1995: 0.24 Working background read-ahead. (still problems)
  26 mrt 1995: 0.25 Multi-session ioctl added (kernel v1.2).
               Statistics implemented, though separate stats206.h.
-              Accessible trough ioctl 0x1000 (just a number).
+              Accessible through ioctl 0x1000 (just a number).
               Hard to choose between v1.2 development and 1.1.75.
               Bottom-half doesn't work with 1.2...
               0.25a: fixed... typo. Still problems...
diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c
index 8d0958c38b6b..4f50ee5767a2 100644
--- a/drivers/macintosh/therm_pm72.c
+++ b/drivers/macintosh/therm_pm72.c
@@ -630,12 +630,12 @@ static int read_eeprom(int cpu, struct mpu_data *out)
         sprintf(nodename, "/u3@0,f8000000/i2c@f8001000/cpuid@a%d", cpu ? 2 : 0);
         np = of_find_node_by_path(nodename);
         if (np == NULL) {
-                printk(KERN_ERR "therm_pm72: Failed to retreive cpuid node from device-tree\n");
+                printk(KERN_ERR "therm_pm72: Failed to retrieve cpuid node from device-tree\n");
                 return -ENODEV;
         }
         data = (u8 *)get_property(np, "cpuid", &len);
         if (data == NULL) {
-                printk(KERN_ERR "therm_pm72: Failed to retreive cpuid property from device-tree\n");
+                printk(KERN_ERR "therm_pm72: Failed to retrieve cpuid property from device-tree\n");
                 of_node_put(np);
                 return -ENODEV;
         }
diff --git a/drivers/macintosh/windfarm_pm81.c b/drivers/macintosh/windfarm_pm81.c
index 80ddf9776bde..eb69a601e765 100644
--- a/drivers/macintosh/windfarm_pm81.c
+++ b/drivers/macintosh/windfarm_pm81.c
@@ -26,7 +26,7 @@
  *    (typically the drive fan)
  *  - the main control (first control) gets the target value scaled with
  *    the first pair of factors, and is then modified as below
- *  - the value of the target of the CPU Fan control loop is retreived,
+ *  - the value of the target of the CPU Fan control loop is retrieved,
  *    scaled with the second pair of factors, and the max of that and
  *    the scaled target is applied to the main control.
  *
diff --git a/drivers/media/radio/radio-sf16fmr2.c b/drivers/media/radio/radio-sf16fmr2.c
index 26632cead09a..099ffb3b9c71 100644
--- a/drivers/media/radio/radio-sf16fmr2.c
+++ b/drivers/media/radio/radio-sf16fmr2.c
@@ -48,7 +48,7 @@ static int io = 0x384;
 static int radio_nr = -1;
 
 /* hw precision is 12.5 kHz
- * It is only usefull to give freq in intervall of 200 (=0.0125Mhz),
+ * It is only useful to give freq in intervall of 200 (=0.0125Mhz),
  * other bits will be truncated
  */
 #define RSF16_ENCODE(x) ((x)/200+856)
diff --git a/drivers/message/i2o/README.ioctl b/drivers/message/i2o/README.ioctl
index 73dd084c0e98..65c0c47aeb79 100644
--- a/drivers/message/i2o/README.ioctl
+++ b/drivers/message/i2o/README.ioctl
@@ -185,7 +185,7 @@ VII. Getting Parameters
       ENOMEM      Kernel memory allocation error
 
    A return value of 0 does not mean that the value was actually
-   properly retreived.  The user should check the result list 
+   properly retrieved.  The user should check the result list 
    to determine the specific status of the transaction.
 
 VIII. Downloading Software
diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c
index e92c17f6931c..55c7ed608391 100644
--- a/drivers/net/hp100.c
+++ b/drivers/net/hp100.c
@@ -276,7 +276,7 @@ static void hp100_RegisterDump(struct net_device *dev);
  * Convert an address in a kernel buffer to a bus/phys/dma address.
  * This work *only* for memory fragments part of lp->page_vaddr,
  * because it was properly DMA allocated via pci_alloc_consistent(),
- * so we just need to "retreive" the original mapping to bus/phys/dma
+ * so we just need to "retrieve" the original mapping to bus/phys/dma
  * address - Jean II */
 static inline dma_addr_t virt_to_whatever(struct net_device *dev, u32 * ptr)
 {
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c
index 049c34b37067..593d8adee891 100644
--- a/drivers/net/pcmcia/xirc2ps_cs.c
+++ b/drivers/net/pcmcia/xirc2ps_cs.c
@@ -1598,7 +1598,7 @@ do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
     switch(cmd) {
       case SIOCGMIIPHY:         /* Get the address of the PHY in use. */
         data[0] = 0;            /* we have only this address */
-        /* fall trough */
+        /* fall through */
       case SIOCGMIIREG:         /* Read the specified MII register. */
         data[3] = mii_rd(ioaddr, data[0] & 0x1f, data[1] & 0x1f);
         break;
diff --git a/drivers/net/sk98lin/skdim.c b/drivers/net/sk98lin/skdim.c
index 0fddf61047b4..07c1b4c8699d 100644
--- a/drivers/net/sk98lin/skdim.c
+++ b/drivers/net/sk98lin/skdim.c
@@ -180,7 +180,7 @@ SkDimModerate(SK_AC *pAC) {
                 /*
                 ** The number of interrupts per sec is the same as expected.
                 ** Evalulate the descriptor-ratio. If it has changed, a resize 
-                ** in the moderation timer might be usefull
+                ** in the moderation timer might be useful
                 */
                 if (M_DIMINFO.AutoSizing) {
                     ResizeDimTimerDuration(pAC);
diff --git a/drivers/net/sk98lin/skge.c b/drivers/net/sk98lin/skge.c
index 197edd74fbb5..a5f2b1ee0752 100644
--- a/drivers/net/sk98lin/skge.c
+++ b/drivers/net/sk98lin/skge.c
@@ -2851,7 +2851,7 @@ unsigned long	Flags;			/* for spin lock */
  * Description:
  *      This function is called if an ioctl is issued on the device.
  *      There are three subfunction for reading, writing and test-writing
- *      the private MIB data structure (usefull for SysKonnect-internal tools).
+ *      the private MIB data structure (useful for SysKonnect-internal tools).
  *
  * Returns:
  *      0, if everything is ok
diff --git a/drivers/net/sk98lin/skgepnmi.c b/drivers/net/sk98lin/skgepnmi.c
index 58e1a5be913f..a386172107e8 100644
--- a/drivers/net/sk98lin/skgepnmi.c
+++ b/drivers/net/sk98lin/skgepnmi.c
@@ -611,7 +611,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode always zero */
  * Description:
  *      Calls a general sub-function for all this stuff. The preset does
  *      the same as a set, but returns just before finally setting the
- *      new value. This is usefull to check if a set might be successfull.
+ *      new value. This is useful to check if a set might be successfull.
  *      If the instance -1 is passed, an array of values is supposed and
  *      all instances of the OID will be set.
  *
@@ -654,7 +654,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode always zero */
  * Description:
  *      Calls a general sub-function for all this stuff. The preset does
  *      the same as a set, but returns just before finally setting the
- *      new value. This is usefull to check if a set might be successfull.
+ *      new value. This is useful to check if a set might be successfull.
  *      If the instance -1 is passed, an array of values is supposed and
  *      all instances of the OID will be set.
  *
@@ -870,7 +870,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode always zero */
  * Description:
  *      Calls a general sub-function for all this set stuff. The preset does
  *      the same as a set, but returns just before finally setting the
- *      new value. This is usefull to check if a set might be successfull.
+ *      new value. This is useful to check if a set might be successfull.
  *      The sub-function runs through the IdTable, checks which OIDs are able
  *      to set, and calls the handler function of the OID to perform the
  *      preset. The return value of the function will also be stored in
@@ -6473,7 +6473,7 @@ unsigned int PhysPortIndex)	/* Physical port index */
  *
  * Description:
  *      The COMMON module only tells us if the mode is half or full duplex.
- *      But in the decade of auto sensing it is usefull for the user to
+ *      But in the decade of auto sensing it is useful for the user to
  *      know if the mode was negotiated or forced. Therefore we have a
  *      look to the mode, which was last used by the negotiation process.
  *
diff --git a/drivers/parisc/led.c b/drivers/parisc/led.c
index 95bd07b8b61b..315be4770d3e 100644
--- a/drivers/parisc/led.c
+++ b/drivers/parisc/led.c
@@ -347,7 +347,7 @@ static void led_LCD_driver(unsigned char leds)
    ** 
    ** led_get_net_activity()
    ** 
-   ** calculate if there was TX- or RX-troughput on the network interfaces
+   ** calculate if there was TX- or RX-throughput on the network interfaces
    ** (analog to dev_get_info() from net/core/dev.c)
    **   
  */
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index ed1899d307db..be3fd9bce573 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -11,14 +11,14 @@ config USB_EHCI_HCD
           The Enhanced Host Controller Interface (EHCI) is standard for USB 2.0
           "high speed" (480 Mbit/sec, 60 Mbyte/sec) host controller hardware.
           If your USB host controller supports USB 2.0, you will likely want to
-          configure this Host Controller Driver.  At this writing, the primary
-          implementation of EHCI is a chip from NEC, widely available in add-on
-          PCI cards, but implementations are in the works from other vendors
-          including Intel and Philips.  Motherboard support is appearing.
+          configure this Host Controller Driver.  At the time of this writing, 
+          the primary implementation of EHCI is a chip from NEC, widely available
+          in add-on PCI cards, but implementations are in the works from other 
+          vendors including Intel and Philips.  Motherboard support is appearing.
 
           EHCI controllers are packaged with "companion" host controllers (OHCI
           or UHCI) to handle USB 1.1 devices connected to root hub ports.  Ports
-          will connect to EHCI if it the device is high speed, otherwise they
+          will connect to EHCI if the device is high speed, otherwise they
           connect to a companion controller.  If you configure EHCI, you should
           probably configure the OHCI (for NEC and some other vendors) USB Host
           Controller Driver or UHCI (for Via motherboards) Host Controller
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c
index af18355e94cc..4e9637eb6137 100644
--- a/drivers/usb/serial/cypress_m8.c
+++ b/drivers/usb/serial/cypress_m8.c
@@ -357,7 +357,7 @@ static int cypress_serial_control (struct usb_serial_port *port, unsigned baud_m
                         } while (retval != 5 && retval != ENODEV);
 
                         if (retval != 5) {
-                                err("%s - failed to retreive serial line settings - %d", __FUNCTION__, retval);
+                                err("%s - failed to retrieve serial line settings - %d", __FUNCTION__, retval);
                                 return retval;
                         } else {
                                 spin_lock_irqsave(&priv->lock, flags);
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 8bc8337c99c4..4dd6865d32b0 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -584,7 +584,7 @@ static struct usb_serial_driver *search_serial_device(struct usb_interface *ifac
         const struct usb_device_id *id;
         struct usb_serial_driver *t;
 
-        /* List trough know devices and see if the usb id matches */
+        /* Check if the usb id matches a known device */
         list_for_each(p, &usb_serial_driver_list) {
                 t = list_entry(p, struct usb_serial_driver, driver_list);
                 id = usb_match_id(iface, t->id_table);
diff --git a/drivers/video/aty/radeon_monitor.c b/drivers/video/aty/radeon_monitor.c
index ea7c86306918..7f9838dceab5 100644
--- a/drivers/video/aty/radeon_monitor.c
+++ b/drivers/video/aty/radeon_monitor.c
@@ -423,7 +423,7 @@ static int __devinit radeon_parse_monitor_layout(struct radeonfb_info *rinfo,
 /*
  * Probe display on both primary and secondary card's connector (if any)
  * by various available techniques (i2c, OF device tree, BIOS, ...) and
- * try to retreive EDID. The algorithm here comes from XFree's radeon
+ * try to retrieve EDID. The algorithm here comes from XFree's radeon
  * driver
  */
 void __devinit radeon_probe_screens(struct radeonfb_info *rinfo,
diff --git a/drivers/video/logo/Makefile b/drivers/video/logo/Makefile
index d0244c04af5a..4ef5cd19609d 100644
--- a/drivers/video/logo/Makefile
+++ b/drivers/video/logo/Makefile
@@ -16,7 +16,7 @@ obj-$(CONFIG_LOGO_M32R_CLUT224)		+= logo_m32r_clut224.o
 
 # How to generate logo's
 
-# Use logo-cfiles to retreive list of .c files to be built
+# Use logo-cfiles to retrieve list of .c files to be built
 logo-cfiles = $(notdir $(patsubst %.$(2), %.c, \
               $(wildcard $(srctree)/$(src)/*$(1).$(2))))
 
diff --git a/drivers/w1/Kconfig b/drivers/w1/Kconfig
index 9a1e00dd3e02..4baf61a22327 100644
--- a/drivers/w1/Kconfig
+++ b/drivers/w1/Kconfig
@@ -3,7 +3,7 @@ menu "Dallas's 1-wire bus"
 config W1
         tristate "Dallas's 1-wire support"
         ---help---
-          Dallas's 1-wire bus is usefull to connect slow 1-pin devices
+          Dallas's 1-wire bus is useful to connect slow 1-pin devices
           such as iButtons and thermal sensors.
 
           If you want W1 support, you should say Y here.