Merge commit '9809889c708e' into omap-for-v4.2/wakeirq
authorTony Lindgren <tony@atomide.com>
Mon, 1 Jun 2015 22:07:42 +0000 (15:07 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 1 Jun 2015 22:07:42 +0000 (15:07 -0700)
Needed to avoid a non-trivial merge conflict with the fix.


Trivial merge