From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 6 Feb 2014 00:02:53 +0000 (-0800)
Subject: Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.14-rc2~20
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=ef42c58a5b4b8060a3931aab36bf2b4f81b44afc;p=cascardo%2Flinux.git

Merge branch 'irq-core-for-linus' of git://git./linux/kernel/git/tip/tip

Pull irq updates from Thomas Gleixner:
 "This lot provides:

   * Bugfixes for armada irq controller
   * Updates to renesas irq chip
   * Support for the TI-NSPIRE irq controller

  Not strictly a bug fix only pull request, but important updates for
  some of the arm Socs which I completely forgot to send last week.

  Seems like my obliviousness is getting worse, I just can't remember
  when it started"

* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip: Add support for TI-NSPIRE irqchip
  irqchip: renesas-irqc: Enable mask on suspend
  irqchip: renesas-irqc: Use lazy disable
  irqchip: armada-370-xp: fix MSI race condition
  irqchip: armada-370-xp: fix IPI race condition
---

ef42c58a5b4b8060a3931aab36bf2b4f81b44afc
diff --cc drivers/irqchip/Makefile
index 86b484cb3ec2,292b10645fd8..5194afb39e78
--- a/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@@ -21,7 -20,6 +21,8 @@@ obj-$(CONFIG_SIRF_IRQ)			+= irq-sirfsoc
  obj-$(CONFIG_RENESAS_INTC_IRQPIN)	+= irq-renesas-intc-irqpin.o
  obj-$(CONFIG_RENESAS_IRQC)		+= irq-renesas-irqc.o
  obj-$(CONFIG_VERSATILE_FPGA_IRQ)	+= irq-versatile-fpga.o
+ obj-$(CONFIG_ARCH_NSPIRE)		+= irq-zevio.o
  obj-$(CONFIG_ARCH_VT8500)		+= irq-vt8500.o
  obj-$(CONFIG_TB10X_IRQC)		+= irq-tb10x.o
 +obj-$(CONFIG_XTENSA)			+= irq-xtensa-pic.o
 +obj-$(CONFIG_XTENSA_MX)			+= irq-xtensa-mx.o