Merge branch 'omap-for-v3.15/tmp-merge'
authorTony Lindgren <tony@atomide.com>
Wed, 12 Mar 2014 20:34:50 +0000 (13:34 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 12 Mar 2014 20:34:50 +0000 (13:34 -0700)

Trivial merge