Merge branch 'omap-for-v3.19/fixes' into for-next
authorTony Lindgren <tony@atomide.com>
Mon, 19 Jan 2015 21:22:13 +0000 (13:22 -0800)
committerTony Lindgren <tony@atomide.com>
Mon, 19 Jan 2015 21:22:13 +0000 (13:22 -0800)

Trivial merge