From: Linus Walleij <linus.walleij@linaro.org>
Date: Wed, 4 Dec 2013 13:48:17 +0000 (+0100)
Subject: Merge branch 'mark-irqs' into devel
X-Git-Tag: v3.14-rc1~145^2~46
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33e0aae11e4854c792e9871f94da6d28bf2e2bb8;p=pandora-kernel.git

Merge branch 'mark-irqs' into devel

Conflicts:
	drivers/gpio/gpio-em.c
---

33e0aae11e4854c792e9871f94da6d28bf2e2bb8
Reading git-diff-tree failed