Merge branch 'omap-for-v3.20/dm816x-v2' into for-next
authorTony Lindgren <tony@atomide.com>
Mon, 19 Jan 2015 23:36:38 +0000 (15:36 -0800)
committerTony Lindgren <tony@atomide.com>
Mon, 19 Jan 2015 23:36:38 +0000 (15:36 -0800)

Trivial merge