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/pcmcia/pxa2xx_lubbock.c b/drivers/pcmcia/pxa2xx_lubbock.c
index 25afe637c657..c21888eebb58 100644
--- a/drivers/pcmcia/pxa2xx_lubbock.c
+++ b/drivers/pcmcia/pxa2xx_lubbock.c
@@ -187,7 +187,7 @@ lubbock_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
                          * We need to hack around the const qualifier as
                          * well to keep this ugly workaround localized and
                          * not force it to the rest of the code. Barf bags
-                         * avaliable in the seat pocket in front of you!
+                         * available in the seat pocket in front of you!
                          */
                         ((socket_state_t *)state)->Vcc = 50;
                         ((socket_state_t *)state)->Vpp = 50;