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)
conflict with pending GIC changes.

Conflicts:
drivers/usb/isp1760/isp1760-core.c


Trivial merge