Merge branch 'omap-for-v3.16/tmp-merge-2014-05-19'
authorTony Lindgren <tony@atomide.com>
Wed, 28 May 2014 18:02:27 +0000 (11:02 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 28 May 2014 18:02:27 +0000 (11:02 -0700)

Trivial merge