ASoC: Merge branch 'for-2.6.39' into for-2.6.40

Fix trivial conflict caused by silly spelling fix patch.

Conflicts:
	sound/soc/codecs/wm8994.c

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 356e74d20b80..337bdcd5abc9 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -2353,7 +2353,7 @@ static int start_nic(struct s2io_nic *nic)
 
         if (s2io_link_fault_indication(nic) == MAC_RMAC_ERR_TIMER) {
                 /*
-                 * Dont see link state interrupts initally on some switches,
+                 * Dont see link state interrupts initially on some switches,
                  * so directly scheduling the link state task here.
                  */
                 schedule_work(&nic->set_link_task);
@@ -3563,7 +3563,7 @@ static void s2io_reset(struct s2io_nic *sp)
         }
 
         /*
-         * Clear spurious ECC interrupts that would have occured on
+         * Clear spurious ECC interrupts that would have occurred on
          * XFRAME II cards after reset.
          */
         if (sp->device_type == XFRAME_II_DEVICE) {
@@ -4065,7 +4065,7 @@ static int s2io_close(struct net_device *dev)
  *  Description :
  *  This function is the Tx entry point of the driver. S2IO NIC supports
  *  certain protocol assist features on Tx side, namely  CSO, S/G, LSO.
- *  NOTE: when device cant queue the pkt,just the trans_start variable will
+ *  NOTE: when device can't queue the pkt,just the trans_start variable will
  *  not be upadted.
  *  Return value:
  *  0 on success & 1 on failure.