From: Jason Cooper <jason@lakedaemon.net>
Date: Thu, 2 Oct 2014 13:04:45 +0000 (+0000)
Subject: Merge branch 'irqchip/broadcom' into irqchip/core
X-Git-Tag: fixes-against-v3.18-rc2~141^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f7472655fbe70f422c08f78d107ca24a791d7b14;p=pandora-kernel.git

Merge branch 'irqchip/broadcom' into irqchip/core

Conflicts:
	drivers/irqchip/Makefile
---

f7472655fbe70f422c08f78d107ca24a791d7b14
Reading git-diff-tree failed