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/atm/firestream.c b/drivers/atm/firestream.c
index 049650d42c88..ef7a658312a6 100644
--- a/drivers/atm/firestream.c
+++ b/drivers/atm/firestream.c
@@ -1782,7 +1782,7 @@ static int __devinit fs_init (struct fs_dev *dev)
                 write_fs (dev, RAS0, RAS0_DCD_XHLT 
                           | (((1 << FS155_VPI_BITS) - 1) * RAS0_VPSEL)
                           | (((1 << FS155_VCI_BITS) - 1) * RAS0_VCSEL));
-                /* We can chose the split arbitarily. We might be able to 
+                /* We can chose the split arbitrarily. We might be able to 
                    support more. Whatever. This should do for now. */
                 dev->atm_dev->ci_range.vpi_bits = FS155_VPI_BITS;
                 dev->atm_dev->ci_range.vci_bits = FS155_VCI_BITS;