From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 8 Apr 2015 21:26:21 +0000 (+0200)
Subject: Merge branch 'linus' into irq/core to get the GIC updates which
X-Git-Tag: omap-for-v4.1/fixes-rc1~171^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=462b69b1e43ceccab68a47d65b1e46520cd0fdc0;p=pandora-kernel.git

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

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

462b69b1e43ceccab68a47d65b1e46520cd0fdc0
Reading git-diff-tree failed