From: Jason Cooper <jason@lakedaemon.net>
Date: Fri, 10 Apr 2015 22:58:19 +0000 (+0000)
Subject: Merge branch 'irqchip/stacked-irq_set_wake' into irqchip/core
X-Git-Tag: omap-for-v4.2/o2_dc~161^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a01e7b3258bea93fbf1f028fab1c739d80c61823;p=pandora-kernel.git

Merge branch 'irqchip/stacked-irq_set_wake' into irqchip/core

Conflicts:
	drivers/irqchip/irq-gic.c
---

a01e7b3258bea93fbf1f028fab1c739d80c61823
Reading git-diff-tree failed