Merge branch 'omap-for-v3.15/tmp-merge'
authorTony Lindgren <tony@atomide.com>
Sun, 2 Mar 2014 22:25:37 +0000 (14:25 -0800)
committerTony Lindgren <tony@atomide.com>
Sun, 2 Mar 2014 22:25:37 +0000 (14:25 -0800)

Trivial merge