Merge branch 'linus' into irq/core to get the GIC updates which
authorThomas Gleixner <tglx@linutronix.de>
Wed, 8 Apr 2015 21:26:21 +0000 (23:26 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 8 Apr 2015 21:26:21 +0000 (23:26 +0200)
commit462b69b1e43ceccab68a47d65b1e46520cd0fdc0
tree3c961fcb5889c5ab14ab36d8ef7421fc96c95959
parentd8bf368d0631d4bc2612d8bf2e4e8e74e620d0cc
parentf22e6e847115abc3a0e2ad7bb18d243d42275af1
Merge branch 'linus' into irq/core to get the GIC updates which
conflict with pending GIC changes.

Conflicts:
drivers/usb/isp1760/isp1760-core.c
include/linux/interrupt.h
kernel/irq/manage.c