Merge branch 'omap-for-v3.13/tmp-merge-take2'
authorTony Lindgren <tony@atomide.com>
Wed, 23 Oct 2013 10:47:01 +0000 (03:47 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 23 Oct 2013 10:47:01 +0000 (03:47 -0700)

Trivial merge