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

5 files changed, 8 insertions, 8 deletions

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