Merge branch 'master'; commit 'v2.6.39-rc3' into next

1 files changed, 2 insertions, 2 deletions

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 616ec1c6b06f..4af1e2b244cb 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -415,7 +415,7 @@ out:
  *      @desc:  the interrupt description structure for this irq
  *
  *      Interrupt occures on the falling and/or rising edge of a hardware
- *      signal. The occurence is latched into the irq controller hardware
+ *      signal. The occurrence is latched into the irq controller hardware
  *      and must be acked in order to be reenabled. After the ack another
  *      interrupt can happen on the same source even before the first one
  *      is handled by the associated event handler. If this happens it
@@ -514,7 +514,7 @@ void handle_edge_eoi_irq(unsigned int irq, struct irq_desc *desc)
         } while ((desc->istate & IRQS_PENDING) &&
                  !irqd_irq_disabled(&desc->irq_data));
 
-out_unlock:
+out_eoi:
         chip->irq_eoi(&desc->irq_data);
         raw_spin_unlock(&desc->lock);
 }