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: (24 commits)
  trivial: chack -> check typo fix in main Makefile
  trivial: Add a space (and a comma) to a printk in 8250 driver
  trivial: Fix misspelling of "firmware" in docs for ncr53c8xx/sym53c8xx
  trivial: Fix misspelling of "firmware" in powerpc Makefile
  trivial: Fix misspelling of "firmware" in usb.c
  trivial: Fix misspelling of "firmware" in qla1280.c
  trivial: Fix misspelling of "firmware" in a100u2w.c
  trivial: Fix misspelling of "firmware" in megaraid.c
  trivial: Fix misspelling of "firmware" in ql4_mbx.c
  trivial: Fix misspelling of "firmware" in acpi_memhotplug.c
  trivial: Fix misspelling of "firmware" in ipw2100.c
  trivial: Fix misspelling of "firmware" in atmel.c
  trivial: Fix misspelled firmware in Kconfig
  trivial: fix an -> a typos in documentation and comments
  trivial: fix then -> than typos in comments and documentation
  trivial: update Jesper Juhl CREDITS entry with new email
  trivial: fix singal -> signal typo
  trivial: Fix incorrect use of "loose" in event.c
  trivial: printk: fix indentation of new_text_line declaration
  trivial: rtc-stk17ta8: fix sparse warning
  ...

4 files changed, 6 insertions, 6 deletions

diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index 350157fcd080..4223672c4432 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -3836,7 +3836,7 @@ static int reset_atmel_card(struct net_device *dev)
            This routine is also responsible for initialising some
            hardware-specific fields in the atmel_private structure,
            including a copy of the firmware's hostinfo stucture
-           which is the route into the rest of the firmare datastructures. */
+           which is the route into the rest of the firmware datastructures. */
 
         struct atmel_private *priv = netdev_priv(dev);
         u8 configuration;
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
index 1667065b86a7..823c2bf5e31e 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
@@ -1332,7 +1332,7 @@ static int ipw2100_power_cycle_adapter(struct ipw2100_priv *priv)
                        IPW_AUX_HOST_RESET_REG_STOP_MASTER);
 
         /* Step 2. Wait for stop Master Assert
-         *         (not more then 50us, otherwise ret error */
+         *         (not more than 50us, otherwise ret error */
         i = 5;
         do {
                 udelay(IPW_WAIT_RESET_MASTER_ASSERT_COMPLETE_DELAY);
@@ -1830,7 +1830,7 @@ static void ipw2100_down(struct ipw2100_priv *priv)
                 cancel_delayed_work(&priv->rf_kill);
         }
 
-        /* Kill the firmare hang check timer */
+        /* Kill the firmware hang check timer */
         if (!priv->stop_hang_check) {
                 priv->stop_hang_check = 1;
                 cancel_delayed_work(&priv->hang_check);
diff --git a/drivers/net/wireless/rt2x00/rt2x00crypto.c b/drivers/net/wireless/rt2x00/rt2x00crypto.c
index 37ad0d2fb64c..aee9cba13eb3 100644
--- a/drivers/net/wireless/rt2x00/rt2x00crypto.c
+++ b/drivers/net/wireless/rt2x00/rt2x00crypto.c
@@ -184,8 +184,8 @@ void rt2x00crypto_rx_insert_iv(struct sk_buff *skb, unsigned int align,
          * Make room for new data, note that we increase both
          * headsize and tailsize when required. The tailsize is
          * only needed when ICV data needs to be inserted and
-         * the padding is smaller then the ICV data.
-         * When alignment requirements is greater then the
+         * the padding is smaller than the ICV data.
+         * When alignment requirements is greater than the
          * ICV data we must trim the skb to the correct size
          * because we need to remove the extra bytes.
          */
diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c
index dd0de3a9ed4e..7015f2480550 100644
--- a/drivers/net/wireless/strip.c
+++ b/drivers/net/wireless/strip.c
@@ -236,7 +236,7 @@ struct strip {
         unsigned long tx_errors;        /* Planned stuff                */
         unsigned long rx_dropped;       /* No memory for skb            */
         unsigned long tx_dropped;       /* When MTU change              */
-        unsigned long rx_over_errors;   /* Frame bigger then STRIP buf. */
+        unsigned long rx_over_errors;   /* Frame bigger than STRIP buf. */
 
         unsigned long pps_timer;        /* Timer to determine pps       */
         unsigned long rx_pps_count;     /* Counter to determine pps     */