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

diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
index 3780da8ad12d..036feeb5e3f6 100644
--- a/drivers/tty/rocket.c
+++ b/drivers/tty/rocket.c
@@ -2060,7 +2060,7 @@ static __init int register_PCI(int i, struct pci_dev *dev)
                         sClockPrescale = 0x19;
                         rp_baud_base[i] = 230400;
                 } else {
-                        /* mod 4 (devide by 5) prescale */
+                        /* mod 4 (divide by 5) prescale */
                         sClockPrescale = 0x14;
                         rp_baud_base[i] = 460800;
                 }
@@ -2183,7 +2183,7 @@ static int __init init_ISA(int i)
                 sClockPrescale = 0x19;  /* mod 9 (divide by 10) prescale */
                 rp_baud_base[i] = 230400;
         } else {
-                sClockPrescale = 0x14;  /* mod 4 (devide by 5) prescale */
+                sClockPrescale = 0x14;  /* mod 4 (divide by 5) prescale */
                 rp_baud_base[i] = 460800;
         }