Merge branch 'omap-for-v3.13/tmp-merge'
authorTony Lindgren <tony@atomide.com>
Mon, 14 Oct 2013 17:47:52 +0000 (10:47 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 14 Oct 2013 17:47:52 +0000 (10:47 -0700)

Trivial merge