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

5 files changed, 13 insertions, 13 deletions

diff --git a/drivers/char/n_hdlc.c b/drivers/char/n_hdlc.c
index c3660d8781a4..a133a62f3d55 100644
--- a/drivers/char/n_hdlc.c
+++ b/drivers/char/n_hdlc.c
@@ -562,7 +562,7 @@ static void n_hdlc_tty_receive(struct tty_struct *tty, const __u8 *data,
 }       /* end of n_hdlc_tty_receive() */
 
 /**
- * n_hdlc_tty_read - Called to retreive one frame of data (if available)
+ * n_hdlc_tty_read - Called to retrieve one frame of data (if available)
  * @tty - pointer to tty instance data
  * @file - pointer to open file object
  * @buf - pointer to returned data buffer
diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c
index 942fae0f2130..c2506b56a186 100644
--- a/drivers/net/tlan.c
+++ b/drivers/net/tlan.c
@@ -2865,11 +2865,11 @@ void TLan_PhyMonitor( struct net_device *dev )
          *                              for this device.
          *              phy             The address of the PHY to be queried.
          *              reg             The register whose contents are to be
-         *                              retreived.
+         *                              retrieved.
          *              val             A pointer to a variable to store the
          *                              retrieved value.
          *
-         *      This function uses the TLAN's MII bus to retreive the contents
+         *      This function uses the TLAN's MII bus to retrieve the contents
          *      of a given register on a PHY.  It sends the appropriate info
          *      and then reads the 16-bit register value from the MII bus via
          *      the TLAN SIO register.
diff --git a/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c
index 27e9404547f3..dba4cc026077 100644
--- a/drivers/usb/class/usblp.c
+++ b/drivers/usb/class/usblp.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1999 Michael Gee       <michael@linuxspecific.com>
  * Copyright (c) 1999 Pavel Machek      <pavel@suse.cz>
- * Copyright (c) 2000 Randy Dunlap      <rddunlap@osdl.org>
+ * Copyright (c) 2000 Randy Dunlap      <rdunlap@xenotime.net>
  * Copyright (c) 2000 Vojtech Pavlik    <vojtech@suse.cz>
  # Copyright (c) 2001 Pete Zaitcev      <zaitcev@redhat.com>
  # Copyright (c) 2001 David Paschal     <paschal@rcsis.com>
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h
index f380f9eaff71..00d45f8600de 100644
--- a/drivers/usb/serial/ftdi_sio.h
+++ b/drivers/usb/serial/ftdi_sio.h
@@ -727,7 +727,7 @@ typedef enum {
  */
 
 /* FTDI_SIO_GET_MODEM_STATUS */
-/* Retreive the current value of the modem status register */
+/* Retrieve the current value of the modem status register */
 
 #define FTDI_SIO_GET_MODEM_STATUS_REQUEST_TYPE 0xc0
 #define FTDI_SIO_GET_MODEM_STATUS_REQUEST FTDI_SIO_GET_MODEM_STATUS
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
index 4f01ccc02aa4..156db84cb363 100644
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@@ -594,7 +594,7 @@ static int __devinit radeon_probe_pll_params(struct radeonfb_info *rinfo)
 }
 
 /*
- * Retreive PLL infos by different means (BIOS, Open Firmware, register probing...)
+ * Retrieve PLL infos by different means (BIOS, Open Firmware, register probing...)
  */
 static void __devinit radeon_get_pllinfo(struct radeonfb_info *rinfo)
 {
@@ -660,17 +660,17 @@ static void __devinit radeon_get_pllinfo(struct radeonfb_info *rinfo)
 
 #ifdef CONFIG_PPC_OF
         /*
-         * Retreive PLL infos from Open Firmware first
+         * Retrieve PLL infos from Open Firmware first
          */
         if (!force_measure_pll && radeon_read_xtal_OF(rinfo) == 0) {
-                printk(KERN_INFO "radeonfb: Retreived PLL infos from Open Firmware\n");
+                printk(KERN_INFO "radeonfb: Retrieved PLL infos from Open Firmware\n");
                 goto found;
         }
 #endif /* CONFIG_PPC_OF */
 
         /*
          * Check out if we have an X86 which gave us some PLL informations
-         * and if yes, retreive them
+         * and if yes, retrieve them
          */
         if (!force_measure_pll && rinfo->bios_seg) {
                 u16 pll_info_block = BIOS_IN16(rinfo->fp_bios_start + 0x30);
@@ -682,7 +682,7 @@ static void __devinit radeon_get_pllinfo(struct radeonfb_info *rinfo)
                 rinfo->pll.ppll_min     = BIOS_IN32(pll_info_block + 0x12);
                 rinfo->pll.ppll_max     = BIOS_IN32(pll_info_block + 0x16);
 
-                printk(KERN_INFO "radeonfb: Retreived PLL infos from BIOS\n");
+                printk(KERN_INFO "radeonfb: Retrieved PLL infos from BIOS\n");
                 goto found;
         }
 
@@ -691,7 +691,7 @@ static void __devinit radeon_get_pllinfo(struct radeonfb_info *rinfo)
          * probe them
          */
         if (radeon_probe_pll_params(rinfo) == 0) {
-                printk(KERN_INFO "radeonfb: Retreived PLL infos from registers\n");
+                printk(KERN_INFO "radeonfb: Retrieved PLL infos from registers\n");
                 goto found;
         }
 
@@ -702,7 +702,7 @@ static void __devinit radeon_get_pllinfo(struct radeonfb_info *rinfo)
 
 found:
         /*
-         * Some methods fail to retreive SCLK and MCLK values, we apply default
+         * Some methods fail to retrieve SCLK and MCLK values, we apply default
          * settings in this case (200Mhz). If that really happne often, we could
          * fetch from registers instead...
          */
@@ -2393,7 +2393,7 @@ static int radeonfb_pci_register (struct pci_dev *pdev,
                rinfo->mapped_vram/1024);
 
         /*
-         * Map the BIOS ROM if any and retreive PLL parameters from
+         * Map the BIOS ROM if any and retrieve PLL parameters from
          * the BIOS. We skip that on mobility chips as the real panel
          * values we need aren't in the ROM but in the BIOS image in
          * memory. This is definitely not the best meacnism though,