tree 3c961fcb5889c5ab14ab36d8ef7421fc96c95959
parent d8bf368d0631d4bc2612d8bf2e4e8e74e620d0cc
parent f22e6e847115abc3a0e2ad7bb18d243d42275af1
author Thomas Gleixner <tglx@linutronix.de> 1428528381 +0200
committer Thomas Gleixner <tglx@linutronix.de> 1428528381 +0200

Merge branch 'linus' into irq/core to get the GIC updates which
conflict with pending GIC changes.

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