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/arch/arm/mach-omap2/omap_phy_internal.c b/arch/arm/mach-omap2/omap_phy_internal.c
index e2e605fe9138..05f6abc96b0d 100644
--- a/arch/arm/mach-omap2/omap_phy_internal.c
+++ b/arch/arm/mach-omap2/omap_phy_internal.c
@@ -112,12 +112,12 @@ int omap4430_phy_power(struct device *dev, int ID, int on)
                 else
                         /*
                          * Enable VBUS Valid, AValid and IDDIG
-                         * high impedence
+                         * high impedance
                          */
                         __raw_writel(IDDIG | AVALID | VBUSVALID,
                                                 ctrl_base + USBOTGHS_CONTROL);
         } else {
-                /* Enable session END and IDIG to high impedence. */
+                /* Enable session END and IDIG to high impedance. */
                 __raw_writel(SESSEND | IDDIG, ctrl_base +
                                         USBOTGHS_CONTROL);
         }