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

Trivial merge