From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 22 Aug 2015 14:45:36 +0000 (-0700)
Subject: Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: firefly_0821_release~176^2~1245
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=84f3fe460838df2ecd80bf9ed943a1b557e81354;p=firefly-linux-kernel-4.4.55.git

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

Pull irq fixes from Thomas Gleixner:
 "A series of small fixlets for a regression visible on OMAP devices
  caused by the conversion of the OMAP interrupt chips to hierarchical
  interrupt domains.  Mostly one liners on the driver side plus a small
  helper function in the core to avoid open coded mess in the drivers"

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip/crossbar: Restore set_wake functionality
  irqchip/crossbar: Restore the mask on suspend behaviour
  ARM: OMAP: wakeupgen: Restore the irq_set_type() mechanism
  irqchip/crossbar: Restore the irq_set_type() mechanism
  genirq: Introduce irq_chip_set_type_parent() helper
  genirq: Don't return ENOSYS in irq_chip_retrigger_hierarchy
---

84f3fe460838df2ecd80bf9ed943a1b557e81354