Merge branches 'doc', 'multitouch', 'upstream' and 'upstream-fixes' into for-linus

[pandora-kernel.git] / arch / cris / arch-v32 / kernel / irq.c

diff --git a/arch/cris/arch-v32/kernel/irq.c b/arch/cris/arch-v32/kernel/irq.c
index 8023176..68a1a59 100644 (file)
--- a/arch/cris/arch-v32/kernel/irq.c
+++ b/arch/cris/arch-v32/kernel/irq.c
@@ -374,7 +374,7 @@ crisv32_do_multiple(struct pt_regs* regs)
        irq_enter();
 
        for (i = 0; i < NBR_REGS; i++) {
-               /* Get which IRQs that happend. */
+               /* Get which IRQs that happened. */
                masked[i] = REG_RD_INT_VECT(intr_vect, irq_regs[cpu],
                        r_masked_vect, i);