Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 1 Nov 2015 19:33:04 +0000 (11:33 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 1 Nov 2015 19:33:04 +0000 (11:33 -0800)
commit4bf690d7e09bbac43dfac9af01ba263e08f37e3e
treedfdf89cefc6ab3689eeba54bd2dd5ec0e2dbc79c
parent56ef9db24633cf6528d2ce736de0985eb125a3c1
parent209da39154837ec1b69fb34f438041939911e4b4
Merge branch 'irq-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull irq fixes from Thomas Gleixner:
 "The last two one-liners for 4.3 from the irqchip space:

   - Regression fix for armada SoC which addresses the fallout from the
     set_irq_flags() cleanup

   - Add the missing propagation of the irq_set_type() callback to the
     parent interrupt controller of the tegra interrupt chip"

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip/tegra: Propagate IRQ type setting to parent
  irqchip/armada-370-xp: Fix regression by clearing IRQ_NOAUTOEN