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/sis900.c b/drivers/net/sis900.c
index 84d4167eee9a..cb317cd069ff 100644
--- a/drivers/net/sis900.c
+++ b/drivers/net/sis900.c
@@ -1180,7 +1180,7 @@ sis900_init_rx_ring(struct net_device *net_dev)
  *
  *      630E equalizer workaround rule(Cyrus Huang 08/15)
  *      PHY register 14h(Test)
- *      Bit 14: 0 -- Automatically dectect (default)
+ *      Bit 14: 0 -- Automatically detect (default)
  *              1 -- Manually set Equalizer filter
  *      Bit 13: 0 -- (Default)
  *              1 -- Speed up convergence of equalizer setting
@@ -1192,7 +1192,7 @@ sis900_init_rx_ring(struct net_device *net_dev)
  *      Then set equalizer value, and set Bit 14 to 1, Bit 9 to 0
  *      Link Off:Set Bit 13 to 1, Bit 14 to 0
  *      Calculate Equalizer value:
- *      When Link is ON and Bit 14 is 0, SIS900PHY will auto-dectect proper equalizer value.
+ *      When Link is ON and Bit 14 is 0, SIS900PHY will auto-detect proper equalizer value.
  *      When the equalizer is stable, this value is not a fixed value. It will be within
  *      a small range(eg. 7~9). Then we get a minimum and a maximum value(eg. min=7, max=9)
  *      0 <= max <= 4  --> set equalizer to max
@@ -1723,7 +1723,7 @@ static int sis900_rx(struct net_device *net_dev)
                 rx_size = data_size - CRC_SIZE;
 
 #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
-                /* ``TOOLONG'' flag means jumbo packet recived. */
+                /* ``TOOLONG'' flag means jumbo packet received. */
                 if ((rx_status & TOOLONG) && data_size <= MAX_FRAME_SIZE)
                         rx_status &= (~ ((unsigned int)TOOLONG));
 #endif