Merged Linux v3.3

diff --cc drivers/mtd/nand/nand_base.c
Simple merge

diff --cc drivers/usb/host/Kconfig
index 95226f34c0c67b94aec1dfab3ba26256b137fefc,353cdd488b93933f61d25d6f916439d882a5afe8..2e7ef6ab729492665fbe2cb8eb18706b25aff897
--- 1/drivers/usb/host/Kconfig
--- 2/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@@ -138,8 -138,8 +138,8 @@@ config USB_EHCI_FS
          Variation of ARC USB block used in some Freescale chips.
  
  config USB_EHCI_MXC
-       bool "Support for Freescale on-chip EHCI USB controller"
+       bool "Support for Freescale i.MX on-chip EHCI USB controller"
 -      depends on USB_EHCI_HCD && ARCH_MXC
 +      depends on USB_EHCI_HCD && (ARCH_MXC || ARCH_MXS)
        select USB_EHCI_ROOT_HUB_TT
        ---help---
          Variation of ARC USB block used in some Freescale chips.

diff --cc drivers/usb/otg/Kconfig
Simple merge

diff --cc kernel/irq/chip.c
index 74fdef9348aeb7f42a3d753a28a68547a6b0df80,fb7db75ee0c87884d40ada2cb88e355cb2ca353c..dfa0792a7761d0f5daa457d0e3dedde96bbb4511
--- 1/kernel/irq/chip.c
--- 2/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@@ -362,12 -381,9 +383,9 @@@ handle_level_irq(unsigned int irq, stru
        if (unlikely(!desc->action || irqd_irq_disabled(&desc->irq_data)))
                goto out_unlock;
  
 -      handle_irq_event(desc);
 +      ret = handle_irq_event(desc);
  
-       if (!irqd_irq_disabled(&desc->irq_data) &&
-                       (!(desc->istate & IRQS_ONESHOT) ||
-                               !(ret & IRQ_WAKE_THREAD)))
-               unmask_irq(desc);
+       cond_unmask_irq(desc);
  
  out_unlock:
        raw_spin_unlock(&desc->lock);