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/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 9a3645fd759b..196e0181b2ed 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -741,7 +741,7 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
         int                     retval;
 
         /* Wait a bit if either of the roothubs need to settle from the
-         * transistion into bus suspend.
+         * transition into bus suspend.
          */
         if (time_before(jiffies, xhci->bus_state[0].next_statechange) ||
                         time_before(jiffies,
@@ -2072,7 +2072,7 @@ int xhci_alloc_streams(struct usb_hcd *hcd, struct usb_device *udev,
                 return -EINVAL;
         }
         vdev = xhci->devs[udev->slot_id];
-        /* Mark each endpoint as being in transistion, so
+        /* Mark each endpoint as being in transition, so
          * xhci_urb_enqueue() will reject all URBs.
          */
         for (i = 0; i < num_eps; i++) {