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

diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
index 7ed08fd1214e..3f04dd3681cf 100644
--- a/drivers/firewire/net.c
+++ b/drivers/firewire/net.c
@@ -453,7 +453,7 @@ static bool fwnet_pd_update(struct fwnet_peer *peer,
         memcpy(pd->pbuf + frag_off, frag_buf, frag_len);
 
         /*
-         * Move list entry to beginnig of list so that oldest partial
+         * Move list entry to beginning of list so that oldest partial
          * datagrams percolate to the end of the list
          */
         list_move_tail(&pd->pd_link, &peer->pd_list);