Merge branch 'omap-for-v3.15/dt' into omap-for-v3.15/tmp-merge
authorTony Lindgren <tony@atomide.com>
Sun, 2 Mar 2014 18:55:59 +0000 (10:55 -0800)
committerTony Lindgren <tony@atomide.com>
Sun, 2 Mar 2014 18:55:59 +0000 (10:55 -0800)

Trivial merge