Merge branch 'for-linus' of git://www.jni.nu/cris

* 'for-linus' of git://www.jni.nu/cris:
  CRISv10: remove redundant tests on unsigned
  CRISv32: irq.c - Move end brace outside #endif
  CRISv32: Fix potential null reference in cryptocop driver.
  CRISv32: Add arch optimized strcmp.
  CRIS: assignment/is equal confusion

diff --combined arch/cris/arch-v32/kernel/irq.c
index d70b445,9c9eb5b..57668db
--- 1/arch/cris/arch-v32/kernel/irq.c
--- 2/arch/cris/arch-v32/kernel/irq.c
+++ b/arch/cris/arch-v32/kernel/irq.c
@@@ -325,14 -325,12 +325,14 @@@ static void end_crisv32_irq(unsigned in
  {
  }
  
 -void set_affinity_crisv32_irq(unsigned int irq, const struct cpumask *dest)
 +int set_affinity_crisv32_irq(unsigned int irq, const struct cpumask *dest)
  {
        unsigned long flags;
        spin_lock_irqsave(&irq_lock, flags);
        irq_allocations[irq - FIRST_IRQ].mask = *dest;
        spin_unlock_irqrestore(&irq_lock, flags);
 +
 +      return 0;
  }
  
  static struct irq_chip crisv32_irq_type = {
@@@ -430,8 -428,8 +430,8 @@@ crisv32_do_multiple(struct pt_regs* reg
                         masked[i] &= ~TIMER_MASK;
                         do_IRQ(TIMER0_INTR_VECT, regs);
                }
-       }
  #endif
+       }
  
  #ifdef IGNORE_MASK
        /* Remove IRQs that can't be handled as multiple. */