Merge branch 'omap-for-v3.15/dt' into omap-for-v3.15/tmp-merge
authorTony Lindgren <tony@atomide.com>
Fri, 7 Mar 2014 16:40:22 +0000 (08:40 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 7 Mar 2014 16:40:22 +0000 (08:40 -0800)

Trivial merge