From: Tony Lindgren <tony@atomide.com>
Date: Mon, 1 Jun 2015 22:07:42 +0000 (-0700)
Subject: Merge commit '9809889c708e' into omap-for-v4.2/wakeirq
X-Git-Tag: omap-for-v4.2/wakeirq-drivers~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb0e42b180c9fd734c26a65daea036587ee4b768;p=pandora-kernel.git

Merge commit '9809889c708e' into omap-for-v4.2/wakeirq

Needed to avoid a non-trivial merge conflict with the fix.
---

eb0e42b180c9fd734c26a65daea036587ee4b768
Reading git-diff-tree failed