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

Trivial merge