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

diff --git a/drivers/usb/gadget/amd5536udc.c b/drivers/usb/gadget/amd5536udc.c
index f8dd7269d79c..6e42aab75806 100644
--- a/drivers/usb/gadget/amd5536udc.c
+++ b/drivers/usb/gadget/amd5536udc.c
@@ -278,7 +278,7 @@ static int udc_enable_dev_setup_interrupts(struct udc *dev)
         return 0;
 }
 
-/* Calculates fifo start of endpoint based on preceeding endpoints */
+/* Calculates fifo start of endpoint based on preceding endpoints */
 static int udc_set_txfifo_addr(struct udc_ep *ep)
 {
         struct udc      *dev;
@@ -2137,7 +2137,7 @@ static irqreturn_t udc_data_out_isr(struct udc *dev, int ep_ix)
         if (use_dma) {
                 /* BNA event ? */
                 if (tmp & AMD_BIT(UDC_EPSTS_BNA)) {
-                        DBG(dev, "BNA ep%dout occured - DESPTR = %x \n",
+                        DBG(dev, "BNA ep%dout occurred - DESPTR = %x \n",
                                         ep->num, readl(&ep->regs->desptr));
                         /* clear BNA */
                         writel(tmp | AMD_BIT(UDC_EPSTS_BNA), &ep->regs->sts);
@@ -2151,7 +2151,7 @@ static irqreturn_t udc_data_out_isr(struct udc *dev, int ep_ix)
         }
         /* HE event ? */
         if (tmp & AMD_BIT(UDC_EPSTS_HE)) {
-                dev_err(&dev->pdev->dev, "HE ep%dout occured\n", ep->num);
+                dev_err(&dev->pdev->dev, "HE ep%dout occurred\n", ep->num);
 
                 /* clear HE */
                 writel(tmp | AMD_BIT(UDC_EPSTS_HE), &ep->regs->sts);
@@ -2354,7 +2354,7 @@ static irqreturn_t udc_data_in_isr(struct udc *dev, int ep_ix)
                 /* BNA ? */
                 if (epsts & AMD_BIT(UDC_EPSTS_BNA)) {
                         dev_err(&dev->pdev->dev,
-                                "BNA ep%din occured - DESPTR = %08lx \n",
+                                "BNA ep%din occurred - DESPTR = %08lx \n",
                                 ep->num,
                                 (unsigned long) readl(&ep->regs->desptr));
 
@@ -2367,7 +2367,7 @@ static irqreturn_t udc_data_in_isr(struct udc *dev, int ep_ix)
         /* HE event ? */
         if (epsts & AMD_BIT(UDC_EPSTS_HE)) {
                 dev_err(&dev->pdev->dev,
-                        "HE ep%dn occured - DESPTR = %08lx \n",
+                        "HE ep%dn occurred - DESPTR = %08lx \n",
                         ep->num, (unsigned long) readl(&ep->regs->desptr));
 
                 /* clear HE */
@@ -2384,7 +2384,7 @@ static irqreturn_t udc_data_in_isr(struct udc *dev, int ep_ix)
                         req = list_entry(ep->queue.next,
                                         struct udc_request, queue);
                         /*
-                         * length bytes transfered
+                         * length bytes transferred
                          * check dma done of last desc. in PPBDU mode
                          */
                         if (use_dma_ppb_du) {
@@ -2784,7 +2784,7 @@ static irqreturn_t udc_control_in_isr(struct udc *dev)
                                         /* write fifo */
                                         udc_txfifo_write(ep, &req->req);
 
-                                        /* lengh bytes transfered */
+                                        /* lengh bytes transferred */
                                         len = req->req.length - req->req.actual;
                                         if (len > ep->ep.maxpacket)
                                                 len = ep->ep.maxpacket;