Merge branch 'irq/for-arm' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip...
authorArnd Bergmann <arnd@arndb.de>
Wed, 20 May 2015 21:09:12 +0000 (23:09 +0200)
committerArnd Bergmann <arnd@arndb.de>
Wed, 20 May 2015 21:09:12 +0000 (23:09 +0200)
* 'irq/for-arm' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip: vf610-mscm: Support NVIC parent chip
  irqchip: nvic: Support hierarchy irq domain
  genirq: generic chip: Support hierarchy domain
  genirq: Add irq_chip_(enable/disable)_parent
  irqdomain: Add non-hierarchy helper irq_domain_set_info


Trivial merge