Merge branch 'omap-for-v3.13/tmp-merge'
authorTony Lindgren <tony@atomide.com>
Thu, 17 Oct 2013 18:07:42 +0000 (11:07 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 17 Oct 2013 18:07:42 +0000 (11:07 -0700)

Trivial merge