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, 4 insertions, 4 deletions

diff --git a/drivers/net/wireless/wl12xx/conf.h b/drivers/net/wireless/wl12xx/conf.h
index 856a8a2fff4f..8a8323896eec 100644
--- a/drivers/net/wireless/wl12xx/conf.h
+++ b/drivers/net/wireless/wl12xx/conf.h
@@ -497,7 +497,7 @@ struct conf_rx_settings {
 #define CONF_TX_RATE_RETRY_LIMIT       10
 
 /*
- * Rates supported for data packets when operating as AP. Note the absense
+ * Rates supported for data packets when operating as AP. Note the absence
  * of the 22Mbps rate. There is a FW limitation on 12 rates so we must drop
  * one. The rate dropped is not mandatory under any operating mode.
  */
@@ -572,7 +572,7 @@ enum conf_tx_ac {
         CONF_TX_AC_BK = 1,         /* background */
         CONF_TX_AC_VI = 2,         /* video */
         CONF_TX_AC_VO = 3,         /* voice */
-        CONF_TX_AC_CTS2SELF = 4,   /* fictious AC, follows AC_VO */
+        CONF_TX_AC_CTS2SELF = 4,   /* fictitious AC, follows AC_VO */
         CONF_TX_AC_ANY_TID = 0x1f
 };
 
@@ -1169,7 +1169,7 @@ struct conf_memory_settings {
 
         /*
          * Minimum required free tx memory blocks in order to assure optimum
-         * performence
+         * performance
          *
          * Range: 0-120
          */
@@ -1177,7 +1177,7 @@ struct conf_memory_settings {
 
         /*
          * Minimum required free rx memory blocks in order to assure optimum
-         * performence
+         * performance
          *
          * Range: 0-120
          */