Merge branch 'omap-for-v4.2/wakeirq' into for-next
authorTony Lindgren <tony@atomide.com>
Thu, 28 May 2015 18:26:50 +0000 (11:26 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 28 May 2015 18:26:50 +0000 (11:26 -0700)

Trivial merge